rename catstring to chinese string

cat-home/src/main/java/com/dianping/cat/helper/CatString.java → cat-home/src/main/java/com/dianping/cat/helper/ChineseString.java

 package com.dianping.cat.helper;
 
-public class CatString {
-
-	public static final String ALL = "All";
+public class ChineseString {
 
 	public static final String ONLINE = "cat.dianpingoa.com";
 
 	public static final String OFFLINE = "cat.qa.dianpingoa.com";
 
-	public static final String CAT = "Cat";
-
 	public static final String EXCEPTION_ALERT_TITLE = " CAT异常过多告警";
 
 	public static final String EXCEPTION_MANY = " 异常过多";
@@ -28,12 +24,6 @@ public class CatString {
 	
 	public static final String ZABBIX_ERROR = "Zabbix告警";
 
-	public static final String SUCCESS = "Success";
-
-	public static final String FAIL = "Fail";
-
-	public static final String TUAN_TOU = "TuanGou";
-
 	public static final String SUM = ":和";
 
 	public static final String COUNT = ":次数";

cat-home/src/main/java/com/dianping/cat/report/page/NormalizePayload.java

@@ -3,7 +3,7 @@ package com.dianping.cat.report.page;
 import org.unidal.lookup.util.StringUtils;
 
 import com.dianping.cat.ServerConfigManager;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class NormalizePayload {
 
@@ -15,7 +15,7 @@ public class NormalizePayload {
 			payload.setDomain(m_manager.getConsoleDefaultDomain());
 		}
 		if (StringUtils.isEmpty(payload.getIpAddress())) {
-			payload.setIpAddress(CatString.ALL);
+			payload.setIpAddress(ReportConstants.ALL);
 		}
 		if (payload.getPeriod().isFuture()) {
 			model.setLongDate(payload.getCurrentDate());

cat-home/src/main/java/com/dianping/cat/report/page/PayloadNormalizer.java

@@ -4,7 +4,7 @@ import org.unidal.lookup.annotation.Inject;
 import org.unidal.lookup.util.StringUtils;
 
 import com.dianping.cat.ServerConfigManager;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class PayloadNormalizer {
 
@@ -17,7 +17,7 @@ public class PayloadNormalizer {
 			payload.setDomain(m_manager.getConsoleDefaultDomain());
 		}
 		if (StringUtils.isEmpty(payload.getIpAddress())) {
-			payload.setIpAddress(CatString.ALL);
+			payload.setIpAddress(ReportConstants.ALL);
 		}
 		if (payload.getPeriod().isFuture()) {
 			model.setLongDate(payload.getCurrentDate());

cat-home/src/main/java/com/dianping/cat/report/page/cache/Handler.java

@@ -26,7 +26,6 @@ import com.dianping.cat.consumer.transaction.model.entity.Machine;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.PayloadNormalizer;
@@ -38,6 +37,7 @@ import com.dianping.cat.report.page.transaction.TransactionMergeManager;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 
 public class Handler implements PageHandler<Context> {
 
@@ -258,7 +258,7 @@ public class Handler implements PageHandler<Context> {
 
 				domainNames.addAll(domains);
 			}
-			if (CatString.ALL.equalsIgnoreCase(ipAddress)) {
+			if (ReportConstants.ALL.equalsIgnoreCase(ipAddress)) {
 				MergeAllMachine all = new MergeAllMachine();
 
 				all.visitTransactionReport(transactionReport);
@@ -270,7 +270,7 @@ public class Handler implements PageHandler<Context> {
 				eventReport = allEvent.getReport();
 			}
 
-			if (CatString.ALL.equalsIgnoreCase(type)) {
+			if (ReportConstants.ALL.equalsIgnoreCase(type)) {
 				MergeAllName all = new MergeAllName();
 
 				all.visitTransactionReport(transactionReport);

cat-home/src/main/java/com/dianping/cat/report/page/cross/Handler.java

@@ -17,7 +17,6 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 import com.dianping.cat.DomainManager;
 import com.dianping.cat.consumer.cross.CrossAnalyzer;
 import com.dianping.cat.consumer.cross.model.entity.CrossReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.PayloadNormalizer;
@@ -30,6 +29,7 @@ import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 
 public class Handler implements PageHandler<Context> {
 	@Inject
@@ -48,11 +48,11 @@ public class Handler implements PageHandler<Context> {
 	private ModelService<CrossReport> m_service;
 
 	private ProjectInfo buildCallProjectInfo(String domain, ModelPeriod period, String date, long duration) {
-		CrossReport projectReport = getHourlyReport(domain, period, date, CatString.ALL);
+		CrossReport projectReport = getHourlyReport(domain, period, date, ReportConstants.ALL);
 		ProjectInfo projectInfo = new ProjectInfo(duration);
 
 		projectInfo.setDomainManager(m_domainManager);
-		projectInfo.setClientIp(CatString.ALL);
+		projectInfo.setClientIp(ReportConstants.ALL);
 		projectInfo.visitCrossReport(projectReport);
 
 		return projectInfo;
@@ -63,7 +63,7 @@ public class Handler implements PageHandler<Context> {
 		ProjectInfo projectInfo = new ProjectInfo(end.getTime() - start.getTime());
 
 		projectInfo.setDomainManager(m_domainManager);
-		projectInfo.setClientIp(CatString.ALL);
+		projectInfo.setClientIp(ReportConstants.ALL);
 		projectInfo.visitCrossReport(projectReport);
 		return projectInfo;
 	}
@@ -146,7 +146,7 @@ public class Handler implements PageHandler<Context> {
 			model.setProjectInfo(projectInfo);
 			model.setReport(projectReport);
 
-			if (payload.getIpAddress().equals(CatString.ALL)) {
+			if (payload.getIpAddress().equals(ReportConstants.ALL)) {
 				List<TypeDetailInfo> details = projectInfo.getServiceProjectsInfo();
 
 				for (TypeDetailInfo info : details) {
@@ -202,7 +202,7 @@ public class Handler implements PageHandler<Context> {
 			model.setProjectInfo(historyProjectInfo);
 			model.setReport(historyProjectReport);
 
-			if (payload.getIpAddress().equals(CatString.ALL)) {
+			if (payload.getIpAddress().equals(ReportConstants.ALL)) {
 				List<TypeDetailInfo> details = historyProjectInfo.getServiceProjectsInfo();
 
 				for (TypeDetailInfo info : details) {

cat-home/src/main/java/com/dianping/cat/report/page/dependency/ExternalInfoBuilder.java

@@ -16,7 +16,7 @@ import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.consumer.top.TopAnalyzer;
 import com.dianping.cat.consumer.top.model.entity.TopReport;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.helper.ChineseString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.dal.report.Event;
 import com.dianping.cat.home.dependency.graph.entity.TopologyGraph;
@@ -28,6 +28,7 @@ import com.dianping.cat.report.page.top.TopMetric;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 import com.dianping.cat.system.config.ExceptionThresholdConfigManager;
 
 public class ExternalInfoBuilder {
@@ -177,7 +178,7 @@ public class ExternalInfoBuilder {
 		long end = payload.getDate() + TimeUtil.ONE_MINUTE * model.getMinute();
 
 		sb.append(GraphConstrant.LINE).append(GraphConstrant.ENTER);
-		sb.append("<span style='color:red'>").append(CatString.ZABBIX_ERROR).append("(")
+		sb.append("<span style='color:red'>").append(ChineseString.ZABBIX_ERROR).append("(")
 		      .append(m_sdf.format(new Date(end - TimeUtil.ONE_MINUTE * 10))).append("-").append(m_sdf.format(end))
 		      .append(")").append("</span>").append(GraphConstrant.ENTER);
 
@@ -227,7 +228,7 @@ public class ExternalInfoBuilder {
 	}
 
 	private TopReport queryTopReport(Payload payload) {
-		String domain = CatString.CAT;
+		String domain = ReportConstants.CAT;
 		String date = String.valueOf(payload.getDate());
 		ModelRequest request = new ModelRequest(domain, payload.getDate()) //
 		      .setProperty("date", date);

cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java

@@ -26,7 +26,6 @@ import com.dianping.cat.consumer.dependency.model.entity.Dependency;
 import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
 import com.dianping.cat.consumer.dependency.model.entity.Index;
 import com.dianping.cat.consumer.dependency.model.entity.Segment;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.dal.report.Event;
 import com.dianping.cat.home.dependency.graph.entity.TopologyEdge;
@@ -51,7 +50,7 @@ public class Handler implements PageHandler<Context> {
 
 	@Inject
 	private TopologyGraphManager m_graphManager;
-	
+
 	@Inject
 	private ProductLineConfigManager m_productLineConfigManger;
 
@@ -64,6 +63,8 @@ public class Handler implements PageHandler<Context> {
 	@Inject
 	private PayloadNormalizer m_normalizePayload;
 
+	public static final String TUAN_TOU = "TuanGou";
+
 	private Segment buildAllSegmentsInfo(DependencyReport report) {
 		Segment result = new Segment();
 		Map<Integer, Segment> segments = report.getSegments();
@@ -162,12 +163,14 @@ public class Handler implements PageHandler<Context> {
 		case TOPOLOGY:
 			TopologyGraph topologyGraph = m_graphManager.buildTopologyGraph(model.getDomain(), reportTime.getTime());
 			Map<String, List<String>> graphDependency = parseDependencies(topologyGraph);
-			Map<String, List<Event>> externalErrors = m_externalInfoBuilder.queryDependencyEvent(graphDependency, model.getDomain(), reportTime);
+			Map<String, List<Event>> externalErrors = m_externalInfoBuilder.queryDependencyEvent(graphDependency,
+			      model.getDomain(), reportTime);
 
 			DependencyReport report = queryDependencyReport(payload);
 			buildHourlyReport(report, model, payload);
 			model.setEvents(externalErrors);
-			m_externalInfoBuilder.buildZabbixErrorOnGraph(topologyGraph, m_externalInfoBuilder.buildZabbixHeader(payload, model), externalErrors);
+			m_externalInfoBuilder.buildZabbixErrorOnGraph(topologyGraph,
+			      m_externalInfoBuilder.buildZabbixHeader(payload, model), externalErrors);
 			m_externalInfoBuilder.buildExceptionInfoOnGraph(payload, model, topologyGraph);
 			model.setReportStart(new Date(payload.getDate()));
 			model.setReportEnd(new Date(payload.getDate() + TimeUtil.ONE_HOUR - 1));
@@ -201,8 +204,8 @@ public class Handler implements PageHandler<Context> {
 		case PRODUCT_LINE:
 			String productLine = payload.getProductLine();
 			if (StringUtil.isEmpty(productLine)) {
-				payload.setProductLine(CatString.TUAN_TOU);
-				productLine = CatString.TUAN_TOU;
+				payload.setProductLine(TUAN_TOU);
+				productLine = TUAN_TOU;
 			}
 			ProductLineDashboard productLineGraph = m_graphManager
 			      .buildProductLineGraph(productLine, reportTime.getTime());

cat-home/src/main/java/com/dianping/cat/report/page/dependency/ProblemInfoVisitor.java

@@ -11,7 +11,7 @@ import com.dianping.cat.consumer.problem.model.entity.Entry;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.consumer.problem.model.entity.Segment;
 import com.dianping.cat.consumer.problem.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.helper.ChineseString;
 import com.dianping.cat.helper.MapUtils;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.page.dependency.graph.GraphConstrant;
@@ -66,7 +66,7 @@ public class ProblemInfoVisitor extends BaseVisitor {
 		
 		if (m_errors.size() > 0) {
 			sb.append(GraphConstrant.LINE).append(GraphConstrant.ENTER);
-			sb.append("<span style='color:red'>").append(CatString.EXCEPTION_INFO).append("（");
+			sb.append("<span style='color:red'>").append(ChineseString.EXCEPTION_INFO).append("（");
 			sb.append(sdf.format(m_start)).append("-")
 			      .append(sdf.format(new Date(m_start.getTime() + TimeUtil.ONE_HOUR - 1))).append("）");
 			sb.append("</span>").append(GraphConstrant.ENTER);

cat-home/src/main/java/com/dianping/cat/report/page/dependency/graph/TopologyGraphConfigManager.java

@@ -20,7 +20,7 @@ import com.dianping.cat.consumer.dependency.model.entity.Index;
 import com.dianping.cat.core.config.Config;
 import com.dianping.cat.core.config.ConfigDao;
 import com.dianping.cat.core.config.ConfigEntity;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.helper.ChineseString;
 import com.dianping.cat.home.dependency.config.entity.DomainConfig;
 import com.dianping.cat.home.dependency.config.entity.EdgeConfig;
 import com.dianping.cat.home.dependency.config.entity.NodeConfig;
@@ -35,11 +35,11 @@ public class TopologyGraphConfigManager implements Initializable {
 
 	private DecimalFormat m_df = new DecimalFormat("0.0");
 
-	private static final String AVG_STR = CatString.RESPONSE_TIME;
+	private static final String AVG_STR = ChineseString.RESPONSE_TIME;
 
-	private static final String ERROR_STR = CatString.EXCEPTION_COUNT;
+	private static final String ERROR_STR = ChineseString.EXCEPTION_COUNT;
 
-	private static final String TOTAL_STR = CatString.TOTAL_COUNT;
+	private static final String TOTAL_STR = ChineseString.TOTAL_COUNT;
 
 	private static final String MILLISECOND = "(ms)";
 

cat-home/src/main/java/com/dianping/cat/report/page/event/EventMergeManager.java

 package com.dianping.cat.report.page.event;
 
 import com.dianping.cat.consumer.event.model.entity.EventReport;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class EventMergeManager {
 
@@ -12,7 +12,7 @@ public class EventMergeManager {
 	}
 
 	public EventReport mergerAllIp(EventReport report, String ipAddress) {
-		if (CatString.ALL.equalsIgnoreCase(ipAddress)) {
+		if (ReportConstants.ALL.equalsIgnoreCase(ipAddress)) {
 			MergeAllMachine all = new MergeAllMachine();
 
 			all.visitEventReport(report);
@@ -22,7 +22,7 @@ public class EventMergeManager {
 	}
 
 	private EventReport mergerAllName(EventReport report, String allName) {
-		if (CatString.ALL.equalsIgnoreCase(allName)) {
+		if (ReportConstants.ALL.equalsIgnoreCase(allName)) {
 			MergeAllName all = new MergeAllName();
 
 			all.visitEventReport(report);

cat-home/src/main/java/com/dianping/cat/report/page/event/Handler.java

@@ -22,7 +22,6 @@ import com.dianping.cat.consumer.event.model.entity.EventName;
 import com.dianping.cat.consumer.event.model.entity.EventReport;
 import com.dianping.cat.consumer.event.model.entity.EventType;
 import com.dianping.cat.consumer.event.model.entity.Machine;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.GraphBuilder;
@@ -33,6 +32,7 @@ import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 import com.google.gson.Gson;
 
 public class Handler implements PageHandler<Context> {
@@ -125,7 +125,7 @@ public class Handler implements PageHandler<Context> {
 		if (name == null || name.length() == 0) {
 			request.setProperty("name", "*");
 			request.setProperty("all", "true");
-			name = CatString.ALL;
+			name = ReportConstants.ALL;
 		}
 		ModelResponse<EventReport> response = m_service.invoke(request);
 		EventReport report = response.getModel();

cat-home/src/main/java/com/dianping/cat/report/page/event/MergeAllMachine.java

@@ -7,7 +7,7 @@ import com.dianping.cat.consumer.event.model.entity.EventType;
 import com.dianping.cat.consumer.event.model.entity.Machine;
 import com.dianping.cat.consumer.event.model.entity.Range;
 import com.dianping.cat.consumer.event.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class MergeAllMachine extends BaseVisitor {
 
@@ -40,14 +40,14 @@ public class MergeAllMachine extends BaseVisitor {
 
 	@Override
 	public void visitMachine(Machine machine) {
-		m_report.findOrCreateMachine(CatString.ALL);
+		m_report.findOrCreateMachine(ReportConstants.ALL);
 		super.visitMachine(machine);
 	}
 
 	@Override
 	public void visitName(EventName name) {
 		m_currentName = name.getId();
-		EventName temp = m_report.findOrCreateMachine(CatString.ALL).findOrCreateType(m_currentType)
+		EventName temp = m_report.findOrCreateMachine(ReportConstants.ALL).findOrCreateType(m_currentType)
 		      .findOrCreateName(m_currentName);
 
 		m_merger.mergeName(temp, name);
@@ -57,7 +57,7 @@ public class MergeAllMachine extends BaseVisitor {
 	@Override
 	public void visitRange(Range range) {
 		m_currentRange = range.getValue();
-		Range temp = m_report.findOrCreateMachine(CatString.ALL).findOrCreateType(m_currentType)
+		Range temp = m_report.findOrCreateMachine(ReportConstants.ALL).findOrCreateType(m_currentType)
 		      .findOrCreateName(m_currentName).findOrCreateRange(m_currentRange);
 
 		m_merger.mergeRange(temp, range);
@@ -67,7 +67,7 @@ public class MergeAllMachine extends BaseVisitor {
 	@Override
 	public void visitType(EventType type) {
 		m_currentType = type.getId();
-		EventType temp = m_report.findOrCreateMachine(CatString.ALL).findOrCreateType(m_currentType);
+		EventType temp = m_report.findOrCreateMachine(ReportConstants.ALL).findOrCreateType(m_currentType);
 
 		m_merger.mergeType(temp, type);
 		super.visitType(type);

cat-home/src/main/java/com/dianping/cat/report/page/event/MergeAllName.java

@@ -7,7 +7,7 @@ import com.dianping.cat.consumer.event.model.entity.EventType;
 import com.dianping.cat.consumer.event.model.entity.Machine;
 import com.dianping.cat.consumer.event.model.entity.Range;
 import com.dianping.cat.consumer.event.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class MergeAllName extends BaseVisitor {
 
@@ -56,7 +56,7 @@ public class MergeAllName extends BaseVisitor {
 		m_merger.mergeName(temp, name);
 		
 		EventName all = m_report.findOrCreateMachine(m_currentIp).findOrCreateType(m_currentType)
-		      .findOrCreateName(CatString.ALL);
+		      .findOrCreateName(ReportConstants.ALL);
 		m_merger.mergeName(all, name);
 
 		m_merger.mergeName(temp, name);
@@ -72,7 +72,7 @@ public class MergeAllName extends BaseVisitor {
 		m_merger.mergeRange(temp, range);
 		
 		Range all = m_report.findOrCreateMachine(m_currentIp).findOrCreateType(m_currentType)
-		      .findOrCreateName(CatString.ALL).findOrCreateRange(m_currentRange);
+		      .findOrCreateName(ReportConstants.ALL).findOrCreateRange(m_currentRange);
 
 		m_merger.mergeRange(all, range);
 		super.visitRange(range);

cat-home/src/main/java/com/dianping/cat/report/page/heartbeat/Handler.java

@@ -16,7 +16,6 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer;
 import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.GraphBuilder;
@@ -27,6 +26,7 @@ import com.dianping.cat.report.view.StringSortHelper;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 
 public class Handler implements PageHandler<Context> {
 	@Inject
@@ -77,7 +77,7 @@ public class Handler implements PageHandler<Context> {
 		      new Date(payload.getDate() + TimeUtil.ONE_HOUR));
 		model.setReport(report);
 
-		if (StringUtil.isEmpty(payload.getIpAddress()) || CatString.ALL.equals(payload.getIpAddress())) {
+		if (StringUtil.isEmpty(payload.getIpAddress()) || ReportConstants.ALL.equals(payload.getIpAddress())) {
 			String ipAddress = getIpAddress(report, payload);
 
 			payload.setIpAddress(ipAddress);
@@ -150,8 +150,8 @@ public class Handler implements PageHandler<Context> {
 		String ipAddress = payload.getIpAddress();
 
 		model.setPage(ReportPage.HEARTBEAT);
-		if (StringUtil.isEmpty(ipAddress) || ipAddress.equals(CatString.ALL)) {
-			model.setIpAddress(CatString.ALL);
+		if (StringUtil.isEmpty(ipAddress) || ipAddress.equals(ReportConstants.ALL)) {
+			model.setIpAddress(ReportConstants.ALL);
 		} else {
 			payload.setRealIp(payload.getIpAddress());
 			model.setIpAddress(payload.getRealIp());

cat-home/src/main/java/com/dianping/cat/report/page/metric/MetricDisplay.java

@@ -14,7 +14,7 @@ import com.dianping.cat.consumer.metric.model.entity.MetricItem;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.consumer.metric.model.entity.Point;
 import com.dianping.cat.consumer.metric.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.helper.ChineseString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.baseline.BaselineService;
 import com.dianping.cat.report.page.LineChart;
@@ -97,15 +97,15 @@ public class MetricDisplay extends BaseVisitor {
 			String configKey = config.getId();
 			if (showSum(config)) {
 				String key = configKey + ":" + SUM;
-				m_lineCharts.put(key, createLineChart(config.getTitle() + CatString.Suffix_SUM));
+				m_lineCharts.put(key, createLineChart(config.getTitle() + ChineseString.Suffix_SUM));
 			}
 			if (showCount(config)) {
 				String key = configKey + ":" + COUNT;
-				m_lineCharts.put(key, createLineChart(config.getTitle() + CatString.Suffix_COUNT));
+				m_lineCharts.put(key, createLineChart(config.getTitle() + ChineseString.Suffix_COUNT));
 			}
 			if (showAvg(config)) {
 				String key = configKey + ":" + AVG;
-				m_lineCharts.put(key, createLineChart(config.getTitle() + CatString.Suffix_AVG));
+				m_lineCharts.put(key, createLineChart(config.getTitle() + ChineseString.Suffix_AVG));
 			}
 		}
 	}

cat-home/src/main/java/com/dianping/cat/report/page/model/Handler.java

@@ -38,7 +38,6 @@ import com.dianping.cat.consumer.transaction.model.entity.Range;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.message.internal.MessageId;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.model.cross.LocalCrossService;
@@ -58,6 +57,7 @@ import com.dianping.cat.report.view.StringSortHelper;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 
 public class Handler extends ContainerHolder implements PageHandler<Context> {
 	@Inject
@@ -239,7 +239,7 @@ public class Handler extends ContainerHolder implements PageHandler<Context> {
 
 		@Override
 		public void visitMachine(com.dianping.cat.consumer.event.model.entity.Machine machine) {
-			if (m_ipAddress == null || m_ipAddress.equals(CatString.ALL)) {
+			if (m_ipAddress == null || m_ipAddress.equals(ReportConstants.ALL)) {
 				super.visitMachine(machine);
 			} else if (machine.getIp().equals(m_ipAddress)) {
 				super.visitMachine(machine);
@@ -292,7 +292,7 @@ public class Handler extends ContainerHolder implements PageHandler<Context> {
 
 		@Override
 		public void visitMachine(com.dianping.cat.consumer.heartbeat.model.entity.Machine machine) {
-			if (machine.getIp().equals(m_ip) || StringUtils.isEmpty(m_ip) || CatString.ALL.equals(m_ip)) {
+			if (machine.getIp().equals(m_ip) || StringUtils.isEmpty(m_ip) || ReportConstants.ALL.equals(m_ip)) {
 				super.visitMachine(machine);
 			}
 		}
@@ -391,7 +391,7 @@ public class Handler extends ContainerHolder implements PageHandler<Context> {
 		@Override
 		public void visitMachine(com.dianping.cat.consumer.transaction.model.entity.Machine machine) {
 			synchronized (machine) {
-				if (m_ipAddress == null || m_ipAddress.equals(CatString.ALL)) {
+				if (m_ipAddress == null || m_ipAddress.equals(ReportConstants.ALL)) {
 					super.visitMachine(machine);
 				} else if (machine.getIp().equals(m_ipAddress)) {
 					super.visitMachine(machine);

cat-home/src/main/java/com/dianping/cat/report/page/model/sql/CompositeSqlService.java

@@ -5,11 +5,11 @@ import java.util.List;
 import com.dianping.cat.consumer.sql.SqlAnalyzer;
 import com.dianping.cat.consumer.sql.SqlReportMerger;
 import com.dianping.cat.consumer.sql.model.entity.SqlReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.report.page.model.spi.internal.BaseCompositeModelService;
 import com.dianping.cat.report.page.model.spi.internal.BaseRemoteModelService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 
 public class CompositeSqlService extends BaseCompositeModelService<SqlReport> {
 	public CompositeSqlService() {
@@ -28,7 +28,7 @@ public class CompositeSqlService extends BaseCompositeModelService<SqlReport> {
 		}
 		SqlReportMerger merger = new SqlReportMerger(new SqlReport(request.getDomain()));
 		String datebase = request.getProperty("database");
-		if (CatString.ALL.equals(datebase)) {
+		if (ReportConstants.ALL.equals(datebase)) {
 			merger.setAllDatabase(true);
 		}
 		for (ModelResponse<SqlReport> response : responses) {

cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java

@@ -23,7 +23,6 @@ import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.ProblemReportAggregation;
 import com.dianping.cat.consumer.problem.model.entity.Machine;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.PayloadNormalizer;
@@ -92,7 +91,7 @@ public class Handler implements PageHandler<Context> {
 		String domain = payload.getDomain();
 		ModelRequest request = new ModelRequest(domain, payload.getDate()) //
 		      .setProperty("type", type);
-		if (!CatString.ALL.equals(payload.getIpAddress())) {
+		if (!ReportConstants.ALL.equals(payload.getIpAddress())) {
 			request.setProperty("ip", payload.getIpAddress());
 		}
 		if (!StringUtils.isEmpty(payload.getThreadId())) {
@@ -153,7 +152,7 @@ public class Handler implements PageHandler<Context> {
 		case VIEW:
 			report = getHourlyReport(payload, VIEW);
 			model.setReport(report);
-			if (ip.equals(CatString.ALL)) {
+			if (ip.equals(ReportConstants.ALL)) {
 				problemStatistics.setAllIp(true);
 			} else {
 				problemStatistics.setIp(ip);
@@ -163,7 +162,7 @@ public class Handler implements PageHandler<Context> {
 			break;
 		case HISTORY:
 			report = showSummarizeReport(model, payload);
-			if (ip.equals(CatString.ALL)) {
+			if (ip.equals(ReportConstants.ALL)) {
 				problemStatistics.setAllIp(true);
 				problemStatistics.visitProblemReport(report);
 			} else {

cat-home/src/main/java/com/dianping/cat/report/page/problem/HourlyLineChartVisitor.java

@@ -13,9 +13,9 @@ import com.dianping.cat.consumer.problem.model.entity.Machine;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
 import com.dianping.cat.consumer.problem.model.entity.Segment;
 import com.dianping.cat.consumer.problem.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.service.ReportConstants;
 
 public class HourlyLineChartVisitor extends BaseVisitor {
 
@@ -84,7 +84,7 @@ public class HourlyLineChartVisitor extends BaseVisitor {
 
 	@Override
 	public void visitMachine(Machine machine) {
-		if (CatString.ALL.equals(m_ip) || m_ip.equals(machine.getIp())) {
+		if (ReportConstants.ALL.equals(m_ip) || m_ip.equals(machine.getIp())) {
 			super.visitMachine(machine);
 		}
 	}

cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java

@@ -15,7 +15,6 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.sql.SqlAnalyzer;
 import com.dianping.cat.consumer.sql.model.entity.SqlReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.PayloadNormalizer;
@@ -24,6 +23,7 @@ import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 
 /**
  * @author youyong
@@ -112,7 +112,7 @@ public class Handler implements PageHandler<Context> {
 		model.setPage(ReportPage.SQL);
 		m_normalizePayload.normalize(model, payload);
 		if (StringUtils.isEmpty(payload.getDatabase())) {
-			payload.setDatabase(CatString.ALL);
+			payload.setDatabase(ReportConstants.ALL);
 		}
 		model.setDatabase(payload.getDatabase());
 	}

cat-home/src/main/java/com/dianping/cat/report/page/state/Handler.java

@@ -14,7 +14,6 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.state.StateAnalyzer;
 import com.dianping.cat.consumer.state.model.entity.StateReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
@@ -22,6 +21,7 @@ import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 import com.google.gson.Gson;
 
 public class Handler implements PageHandler<Context> {
@@ -121,7 +121,7 @@ public class Handler implements PageHandler<Context> {
 		
 		if (action == Action.HOURLY || action == Action.HISTORY) {
 			if (!CAT.equalsIgnoreCase(payload.getDomain()) || StringUtils.isEmpty(ip)) {
-				payload.setIpAddress(CatString.ALL);
+				payload.setIpAddress(ReportConstants.ALL);
 			}
 		}
 		m_normalizePayload.normalize(model, payload);

cat-home/src/main/java/com/dianping/cat/report/page/state/StateShow.java

@@ -14,7 +14,7 @@ import com.dianping.cat.consumer.state.model.entity.Message;
 import com.dianping.cat.consumer.state.model.entity.ProcessDomain;
 import com.dianping.cat.consumer.state.model.entity.StateReport;
 import com.dianping.cat.consumer.state.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class StateShow extends BaseVisitor {
 
@@ -162,7 +162,7 @@ public class StateShow extends BaseVisitor {
 			m_total = new Machine();
 			m_total.setIp(ip);
 		}
-		if (m_ip.equals(CatString.ALL) || m_ip.equalsIgnoreCase(ip)) {
+		if (m_ip.equals(ReportConstants.ALL) || m_ip.equalsIgnoreCase(ip)) {
 			m_total = mergerMachine(m_total, machine);
 			super.visitMachine(machine);
 		}
@@ -180,7 +180,7 @@ public class StateShow extends BaseVisitor {
 
 	@Override
 	public void visitProcessDomain(ProcessDomain processDomain) {
-		if (m_ip.equals(m_currentIp) || m_ip.equals(CatString.ALL)) {
+		if (m_ip.equals(m_currentIp) || m_ip.equals(ReportConstants.ALL)) {
 			ProcessDomain temp = m_processDomains.get(processDomain.getName());
 
 			if (temp == null) {

cat-home/src/main/java/com/dianping/cat/report/page/statistics/Handler.java

@@ -26,7 +26,6 @@ import com.dianping.cat.Cat;
 import com.dianping.cat.core.dal.Project;
 import com.dianping.cat.core.dal.ProjectDao;
 import com.dianping.cat.core.dal.ProjectEntity;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.MapUtils;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.bug.entity.BugReport;
@@ -46,6 +45,7 @@ import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.report.task.heavy.HeavyReportMerger.ServiceComparator;
 import com.dianping.cat.report.task.heavy.HeavyReportMerger.UrlComparator;
+import com.dianping.cat.service.ReportConstants;
 import com.dianping.cat.system.config.BugConfigManager;
 import com.dianping.cat.system.config.UtilizationConfigManager;
 
@@ -227,19 +227,19 @@ public class Handler implements PageHandler<Context> {
 	private BugReport queryBugReport(Payload payload) {
 		Pair<Date, Date> pair = queryStartEndTime(payload);
 		
-		return m_reportService.queryBugReport(CatString.CAT, pair.getKey(), pair.getValue());
+		return m_reportService.queryBugReport(ReportConstants.CAT, pair.getKey(), pair.getValue());
 	}
 
 	private HeavyReport queryHeavyReport(Payload payload) {
 		Pair<Date, Date> pair = queryStartEndTime(payload);
 
-		return m_reportService.queryHeavyReport(CatString.CAT, pair.getKey(), pair.getValue());
+		return m_reportService.queryHeavyReport(ReportConstants.CAT, pair.getKey(), pair.getValue());
 	}
 
 	private ServiceReport queryServiceReport(Payload payload) {
 		Pair<Date, Date> pair = queryStartEndTime(payload);
 
-		return m_reportService.queryServiceReport(CatString.CAT, pair.getKey(), pair.getValue());
+		return m_reportService.queryServiceReport(ReportConstants.CAT, pair.getKey(), pair.getValue());
 	}
 
 	private Pair<Date, Date> queryStartEndTime(Payload payload) {
@@ -264,7 +264,7 @@ public class Handler implements PageHandler<Context> {
 
 	private UtilizationReport queryUtilizationReport(Payload payload) {
 		Pair<Date, Date> pair = queryStartEndTime(payload);
-		UtilizationReport report = m_reportService.queryUtilizationReport(CatString.CAT, pair.getKey(), pair.getValue());
+		UtilizationReport report = m_reportService.queryUtilizationReport(ReportConstants.CAT, pair.getKey(), pair.getValue());
 		new UtilizationReportScore().setConfigManager(m_configManager).visitUtilizationReport(report);
 		return report;
 	}

cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java

@@ -5,7 +5,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.home.bug.entity.BugReport;
 import com.dianping.cat.home.bug.transform.DefaultJsonBuilder;
 import com.dianping.cat.home.heavy.entity.HeavyReport;
@@ -15,6 +14,7 @@ import com.dianping.cat.home.service.entity.Domain;
 import com.dianping.cat.home.service.entity.ServiceReport;
 import com.dianping.cat.home.utilization.entity.UtilizationReport;
 import com.dianping.cat.report.page.AbstractReportModel;
+import com.dianping.cat.service.ReportConstants;
 
 public class Model extends AbstractReportModel<Action, Context> {
 
@@ -97,7 +97,7 @@ public class Model extends AbstractReportModel<Action, Context> {
 
 	@Override
 	public String getDomain() {
-		return CatString.CAT;
+		return ReportConstants.CAT;
 	}
 
 	@Override

cat-home/src/main/java/com/dianping/cat/report/page/top/Handler.java

@@ -13,7 +13,6 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.top.TopAnalyzer;
 import com.dianping.cat.consumer.top.model.entity.TopReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.PayloadNormalizer;
@@ -21,6 +20,7 @@ import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 import com.dianping.cat.system.config.ExceptionThresholdConfigManager;
 
 public class Handler implements PageHandler<Context> {
@@ -40,7 +40,7 @@ public class Handler implements PageHandler<Context> {
 	private ExceptionThresholdConfigManager m_configManager;
 
 	private TopReport getReport(Payload payload) {
-		String domain = CatString.CAT;
+		String domain = ReportConstants.CAT;
 		ModelRequest request = new ModelRequest(domain, payload.getDate());
 
 		if (m_service.isEligable(request)) {

cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java

@@ -21,7 +21,6 @@ import com.dianping.cat.consumer.transaction.model.entity.Machine;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.GraphBuilder;
@@ -37,6 +36,7 @@ import com.dianping.cat.report.page.transaction.GraphPayload.HitPayload;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.service.ReportConstants;
 import com.google.gson.Gson;
 
 public class Handler implements PageHandler<Context> {
@@ -137,7 +137,7 @@ public class Handler implements PageHandler<Context> {
 				Date start = new Date(payload.getDate());
 				Date end = new Date(payload.getDate() + TimeUtil.ONE_HOUR);
 
-				if (CatString.ALL.equals(domain)) {
+				if (ReportConstants.ALL.equals(domain)) {
 					report = m_reportService.queryTransactionReport(domain, start, end);
 				}
 				Set<String> domains = m_reportService.queryAllDomainNames(start, end, TransactionAnalyzer.ID);
@@ -166,7 +166,7 @@ public class Handler implements PageHandler<Context> {
 		if (name == null || name.length() == 0) {
 			request.setProperty("name", "*");
 			request.setProperty("all", "true");
-			name = CatString.ALL;
+			name = ReportConstants.ALL;
 		}
 		ModelResponse<TransactionReport> response = m_service.invoke(request);
 		TransactionReport report = response.getModel();

cat-home/src/main/java/com/dianping/cat/report/page/transaction/MergeAllMachine.java

@@ -8,7 +8,7 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.consumer.transaction.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class MergeAllMachine extends BaseVisitor {
 
@@ -31,7 +31,7 @@ public class MergeAllMachine extends BaseVisitor {
 	@Override
 	public void visitDuration(Duration duration) {
 		m_currentDuration = duration.getValue();
-		Duration temp = m_report.findOrCreateMachine(CatString.ALL).findOrCreateType(m_currentType)
+		Duration temp = m_report.findOrCreateMachine(ReportConstants.ALL).findOrCreateType(m_currentType)
 		      .findOrCreateName(m_currentName).findOrCreateDuration(m_currentDuration);
 
 		m_merger.mergeDuration(temp, duration);
@@ -41,14 +41,14 @@ public class MergeAllMachine extends BaseVisitor {
 
 	@Override
 	public void visitMachine(Machine machine) {
-		m_report.findOrCreateMachine(CatString.ALL);
+		m_report.findOrCreateMachine(ReportConstants.ALL);
 		super.visitMachine(machine);
 	}
 
 	@Override
 	public void visitName(TransactionName name) {
 		m_currentName = name.getId();
-		TransactionName temp = m_report.findOrCreateMachine(CatString.ALL).findOrCreateType(m_currentType)
+		TransactionName temp = m_report.findOrCreateMachine(ReportConstants.ALL).findOrCreateType(m_currentType)
 		      .findOrCreateName(m_currentName);
 
 		m_merger.mergeName(temp, name);
@@ -58,7 +58,7 @@ public class MergeAllMachine extends BaseVisitor {
 	@Override
 	public void visitRange(Range range) {
 		m_currentRange = range.getValue();
-		Range temp = m_report.findOrCreateMachine(CatString.ALL).findOrCreateType(m_currentType)
+		Range temp = m_report.findOrCreateMachine(ReportConstants.ALL).findOrCreateType(m_currentType)
 		      .findOrCreateName(m_currentName).findOrCreateRange(m_currentRange);
 
 		m_merger.mergeRange(temp, range);
@@ -79,7 +79,7 @@ public class MergeAllMachine extends BaseVisitor {
 	@Override
 	public void visitType(TransactionType type) {
 		m_currentType = type.getId();
-		TransactionType temp = m_report.findOrCreateMachine(CatString.ALL).findOrCreateType(m_currentType);
+		TransactionType temp = m_report.findOrCreateMachine(ReportConstants.ALL).findOrCreateType(m_currentType);
 
 		m_merger.mergeType(temp, type);
 		super.visitType(type);

cat-home/src/main/java/com/dianping/cat/report/page/transaction/MergeAllName.java

@@ -8,7 +8,7 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.consumer.transaction.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class MergeAllName extends BaseVisitor {
 
@@ -39,7 +39,7 @@ public class MergeAllName extends BaseVisitor {
 		m_merger.mergeDuration(temp, duration);
 		
 		Duration all = m_report.findOrCreateMachine(m_currentIp).findOrCreateType(m_currentType)
-		      .findOrCreateName(CatString.ALL).findOrCreateDuration(m_currentDuration);
+		      .findOrCreateName(ReportConstants.ALL).findOrCreateDuration(m_currentDuration);
 
 		m_merger.mergeDuration(all, duration);
 
@@ -62,7 +62,7 @@ public class MergeAllName extends BaseVisitor {
 		m_merger.mergeName(temp, name);
 		
 		TransactionName all = m_report.findOrCreateMachine(m_currentIp).findOrCreateType(m_currentType)
-		      .findOrCreateName(CatString.ALL);
+		      .findOrCreateName(ReportConstants.ALL);
 		m_merger.mergeName(all, name);
 
 		m_merger.mergeName(temp, name);
@@ -78,7 +78,7 @@ public class MergeAllName extends BaseVisitor {
 		m_merger.mergeRange(temp, range);
 		
 		Range all = m_report.findOrCreateMachine(m_currentIp).findOrCreateType(m_currentType)
-		      .findOrCreateName(CatString.ALL).findOrCreateRange(m_currentRange);
+		      .findOrCreateName(ReportConstants.ALL).findOrCreateRange(m_currentRange);
 
 		m_merger.mergeRange(all, range);
 		super.visitRange(range);

cat-home/src/main/java/com/dianping/cat/report/page/transaction/TransactionMergeManager.java

 package com.dianping.cat.report.page.transaction;
 
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class TransactionMergeManager {
 
@@ -12,7 +12,7 @@ public class TransactionMergeManager {
 	}
 
 	public TransactionReport mergerAllIp(TransactionReport report, String ipAddress) {
-		if (CatString.ALL.equalsIgnoreCase(ipAddress)) {
+		if (ReportConstants.ALL.equalsIgnoreCase(ipAddress)) {
 			MergeAllMachine all = new MergeAllMachine();
 			
 			all.visitTransactionReport(report);
@@ -22,7 +22,7 @@ public class TransactionMergeManager {
 	}
 
 	private TransactionReport mergerAllName(TransactionReport report, String allName) {
-		if (CatString.ALL.equalsIgnoreCase(allName)) {
+		if (ReportConstants.ALL.equalsIgnoreCase(allName)) {
 			MergeAllName all = new MergeAllName();
 			
 			all.visitTransactionReport(report);

cat-home/src/main/java/com/dianping/cat/report/task/bug/BugReportBuilder.java

@@ -14,7 +14,6 @@ import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.HourlyReport;
 import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.bug.entity.BugReport;
 import com.dianping.cat.home.bug.entity.Domain;
@@ -59,7 +58,7 @@ public class BugReportBuilder implements ReportTaskBuilder {
 
 	@Override
 	public boolean buildHourlyTask(String name, String domain, Date start) {
-		BugReport bugReport = new BugReport(CatString.CAT);
+		BugReport bugReport = new BugReport(ReportConstants.CAT);
 		ProblemReportVisitor visitor = new ProblemReportVisitor().setReport(bugReport);
 		Date end = new Date(start.getTime() + TimeUtil.ONE_HOUR);
 		Set<String> domains = m_reportService.queryAllDomainNames(start, end, ProblemAnalyzer.ID);

cat-home/src/main/java/com/dianping/cat/report/task/heavy/HeavyReportBuilder.java

@@ -13,7 +13,6 @@ import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.HourlyReport;
 import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.heavy.entity.HeavyReport;
 import com.dianping.cat.report.service.ReportService;
@@ -47,7 +46,7 @@ public class HeavyReportBuilder implements ReportTaskBuilder {
 
 	@Override
 	public boolean buildHourlyTask(String name, String domain, Date start) {
-		HeavyReport heavyReport = new HeavyReport(CatString.CAT);
+		HeavyReport heavyReport = new HeavyReport(ReportConstants.CAT);
 		MatrixReportVisitor visitor = new MatrixReportVisitor().setReport(heavyReport);
 		Date end = new Date(start.getTime() + TimeUtil.ONE_HOUR);
 		Set<String> domains = m_reportService.queryAllDomainNames(start, end, MatrixAnalyzer.ID);

cat-home/src/main/java/com/dianping/cat/report/task/service/ServiceReportBuilder.java

@@ -17,7 +17,6 @@ import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.HourlyReport;
 import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.service.entity.Domain;
 import com.dianping.cat.home.service.entity.ServiceReport;
@@ -26,6 +25,7 @@ import com.dianping.cat.report.page.cross.display.TypeDetailInfo;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.report.task.TaskHelper;
 import com.dianping.cat.report.task.spi.ReportTaskBuilder;
+import com.dianping.cat.service.ReportConstants;
 
 public class ServiceReportBuilder implements ReportTaskBuilder {
 
@@ -54,7 +54,7 @@ public class ServiceReportBuilder implements ReportTaskBuilder {
 
 	@Override
 	public boolean buildHourlyTask(String name, String domain, Date start) {
-		ServiceReport serviceReport = new ServiceReport(CatString.CAT);
+		ServiceReport serviceReport = new ServiceReport(ReportConstants.CAT);
 		Date end = new Date(start.getTime() + TimeUtil.ONE_HOUR);
 		Set<String> domains = m_reportService.queryAllDomainNames(start, end, CrossAnalyzer.ID);
 
@@ -63,7 +63,7 @@ public class ServiceReportBuilder implements ReportTaskBuilder {
 			ProjectInfo projectInfo = new ProjectInfo(TimeUtil.ONE_HOUR);
 
 			projectInfo.setDomainManager(m_domainManager);
-			projectInfo.setClientIp(CatString.ALL);
+			projectInfo.setClientIp(ReportConstants.ALL);
 			projectInfo.visitCrossReport(crossReport);
 			Collection<TypeDetailInfo> callInfos = projectInfo.getCallProjectsInfo();
 

cat-home/src/main/java/com/dianping/cat/report/task/sql/SqlMerger.java

@@ -6,8 +6,8 @@ import java.util.Set;
 
 import com.dianping.cat.consumer.sql.SqlReportMerger;
 import com.dianping.cat.consumer.sql.model.entity.SqlReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.report.task.TaskHelper;
+import com.dianping.cat.service.ReportConstants;
 
 public class SqlMerger {
 
@@ -27,8 +27,8 @@ public class SqlMerger {
 		SqlReport sqlReport = buildDailyReport(reports, reportDomain, false);
 		SqlReport sqlReport2 = buildDailyReport(reports, reportDomain, true);
 
-		sqlReport.addDatabase(sqlReport2.findOrCreateDatabase(CatString.ALL));
-		sqlReport.getDomainNames().add(CatString.ALL);
+		sqlReport.addDatabase(sqlReport2.findOrCreateDatabase(ReportConstants.ALL));
+		sqlReport.getDomainNames().add(ReportConstants.ALL);
 		sqlReport.getDomainNames().addAll(domains);
 
 		Date date = sqlReport.getStartTime();

cat-home/src/main/java/com/dianping/cat/report/task/utilization/TransactionReportVisitor.java

@@ -4,9 +4,9 @@ import com.dianping.cat.consumer.transaction.model.entity.Machine;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.consumer.transaction.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.home.utilization.entity.Domain;
 import com.dianping.cat.home.utilization.entity.UtilizationReport;
+import com.dianping.cat.service.ReportConstants;
 
 public class TransactionReportVisitor extends BaseVisitor {
 
@@ -22,7 +22,7 @@ public class TransactionReportVisitor extends BaseVisitor {
 	@Override
 	public void visitMachine(Machine machine) {
 		String ip = machine.getIp();
-		if (CatString.ALL.equals(ip)) {
+		if (ReportConstants.ALL.equals(ip)) {
 			super.visitMachine(machine);
 		}
 	}

cat-home/src/main/java/com/dianping/cat/report/task/utilization/UtilizationReportBuilder.java

@@ -13,13 +13,13 @@ import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.HourlyReport;
 import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.utilization.entity.UtilizationReport;
 import com.dianping.cat.report.page.transaction.TransactionMergeManager;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.report.task.TaskHelper;
 import com.dianping.cat.report.task.spi.ReportTaskBuilder;
+import com.dianping.cat.service.ReportConstants;
 
 public class UtilizationReportBuilder implements ReportTaskBuilder {
 
@@ -47,7 +47,7 @@ public class UtilizationReportBuilder implements ReportTaskBuilder {
 
 	@Override
 	public boolean buildHourlyTask(String name, String domain, Date start) {
-		UtilizationReport utilizationReport = new UtilizationReport(CatString.CAT);
+		UtilizationReport utilizationReport = new UtilizationReport(ReportConstants.CAT);
 		Date end = new Date(start.getTime() + TimeUtil.ONE_HOUR);
 		Set<String> domains = m_reportService.queryAllDomainNames(start, end, TransactionAnalyzer.ID);
 		TransactionReportVisitor visitor = new TransactionReportVisitor().setReport(utilizationReport);
@@ -56,7 +56,7 @@ public class UtilizationReportBuilder implements ReportTaskBuilder {
 			TransactionReport transactionReport = m_reportService.queryTransactionReport(domainName, start, end);
 			int size = transactionReport.getMachines().size();
 			
-			transactionReport = m_mergeManager.mergerAllIp(transactionReport, CatString.ALL);
+			transactionReport = m_mergeManager.mergerAllIp(transactionReport, ReportConstants.ALL);
 			visitor.visitTransactionReport(transactionReport);
 			utilizationReport.findOrCreateDomain(domainName).setMachineNumber(size);
 		}

cat-home/src/main/java/com/dianping/cat/system/notify/render/EventRender.java

@@ -15,9 +15,10 @@ import com.dianping.cat.consumer.event.model.entity.EventType;
 import com.dianping.cat.consumer.event.model.entity.Machine;
 import com.dianping.cat.consumer.event.model.entity.Range;
 import com.dianping.cat.consumer.event.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.helper.ChineseString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.page.event.DisplayTypes;
+import com.dianping.cat.service.ReportConstants;
 
 public class EventRender extends BaseVisitor {
 	private Date m_date;
@@ -50,9 +51,9 @@ public class EventRender extends BaseVisitor {
 
 		String ip = NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
 		if (ip.startsWith("10.")) {
-			m_host = CatString.ONLINE;
+			m_host = ChineseString.ONLINE;
 		} else {
-			m_host = CatString.OFFLINE;
+			m_host = ChineseString.OFFLINE;
 		}
 	}
 
@@ -103,7 +104,7 @@ public class EventRender extends BaseVisitor {
 
 	@Override
 	public void visitType(EventType type) {
-		if (m_currentIp.equals(CatString.ALL)) {
+		if (m_currentIp.equals(ReportConstants.ALL)) {
 			Set<String> types = DisplayTypes.s_unusedTypes;
 			String id = type.getId();
 			if (!types.contains(id)) {

cat-home/src/main/java/com/dianping/cat/system/notify/render/ProblemRender.java

@@ -10,7 +10,7 @@ import java.util.Map;
 
 import com.dianping.cat.configuration.NetworkInterfaceManager;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.helper.ChineseString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.page.problem.ProblemStatistics;
 import com.dianping.cat.report.page.problem.ProblemStatistics.TypeStatistics;
@@ -42,9 +42,9 @@ public class ProblemRender {
 
 		String ip = NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
 		if (ip.startsWith("10.")) {
-			m_host = CatString.ONLINE;
+			m_host = ChineseString.ONLINE;
 		} else {
-			m_host = CatString.OFFLINE;
+			m_host = ChineseString.OFFLINE;
 		}
 	}
 

cat-home/src/main/java/com/dianping/cat/system/notify/render/TransactionRender.java

@@ -12,8 +12,9 @@ import com.dianping.cat.consumer.transaction.model.entity.Machine;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.consumer.transaction.model.transform.BaseVisitor;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.helper.ChineseString;
 import com.dianping.cat.helper.TimeUtil;
+import com.dianping.cat.service.ReportConstants;
 
 public class TransactionRender extends BaseVisitor {
 
@@ -47,9 +48,9 @@ public class TransactionRender extends BaseVisitor {
 
 		String ip = NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
 		if (ip.startsWith("10.")) {
-			m_host = CatString.ONLINE;
+			m_host = ChineseString.ONLINE;
 		} else {
-			m_host = CatString.OFFLINE;
+			m_host = ChineseString.OFFLINE;
 		}
 	}
 
@@ -91,7 +92,7 @@ public class TransactionRender extends BaseVisitor {
 
 	@Override
 	public void visitType(TransactionType type) {
-		if (m_currentIp.equals(CatString.ALL)) {
+		if (m_currentIp.equals(ReportConstants.ALL)) {
 			Type temp = new Type();
 
 			type.setTps(type.getTotalCount() * 1000d / TimeUtil.ONE_DAY / m_totalDays);

cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java

@@ -31,12 +31,12 @@ import com.dianping.cat.consumer.problem.aggregation.AggregationConfigManager;
 import com.dianping.cat.core.dal.Project;
 import com.dianping.cat.core.dal.ProjectDao;
 import com.dianping.cat.core.dal.ProjectEntity;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.home.dependency.config.entity.DomainConfig;
 import com.dianping.cat.home.dependency.config.entity.EdgeConfig;
 import com.dianping.cat.home.dependency.exception.entity.ExceptionLimit;
 import com.dianping.cat.report.page.dependency.graph.TopologyGraphConfigManager;
 import com.dianping.cat.report.view.DomainNavManager;
+import com.dianping.cat.service.ReportConstants;
 import com.dianping.cat.system.SystemPage;
 import com.dianping.cat.system.config.BugConfigManager;
 import com.dianping.cat.system.config.ExceptionThresholdConfigManager;
@@ -121,7 +121,7 @@ public class Handler implements PageHandler<Context> {
 		String domain = config.getId();
 		model.setDomainConfig(config);
 
-		if (domain.equalsIgnoreCase(CatString.ALL)) {
+		if (domain.equalsIgnoreCase(ReportConstants.ALL)) {
 			return m_topologyConfigManager.insertDomainDefaultConfig(type, config);
 		} else {
 			return m_topologyConfigManager.insertDomainConfig(type, config);

cat-home/src/main/java/com/dianping/cat/system/page/config/Model.java

@@ -13,7 +13,6 @@ import com.dianping.cat.consumer.aggreation.model.entity.AggregationRule;
 import com.dianping.cat.consumer.company.model.entity.Domain;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
 import com.dianping.cat.core.dal.Project;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.home.dependency.config.entity.DomainConfig;
 import com.dianping.cat.home.dependency.config.entity.EdgeConfig;
 import com.dianping.cat.home.dependency.config.entity.NodeConfig;
@@ -35,7 +34,7 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
 
 	private List<ExceptionLimit> m_exceptionLimits;
 
-	private String m_opState = CatString.SUCCESS;
+	private String m_opState = SUCCESS;
 
 	private TopologyGraphConfig m_config;
 
@@ -59,6 +58,9 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
 	
 	private Map<String, Domain> m_productLineToDomains;
 
+	public static final String SUCCESS = "Success";
+
+	public static final String FAIL = "Fail";
 
 	public Map<String, Domain> getProductLineToDomains() {
 		return m_productLineToDomains;
@@ -179,9 +181,9 @@ public class Model extends ViewModel<SystemPage, Action, Context> {
 
 	public void setOpState(boolean result) {
 		if (result) {
-			m_opState = CatString.SUCCESS;
+			m_opState = SUCCESS;
 		} else {
-			m_opState = CatString.FAIL;
+			m_opState = FAIL;
 		}
 	}
 

cat-home/src/test/java/com/dianping/cat/report/analyzer/ArchMonthAnalyzer.java

@@ -26,7 +26,6 @@ import com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser;
 import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.DailyReportDao;
 import com.dianping.cat.core.dal.DailyReportEntity;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ReportConstants;
@@ -84,7 +83,7 @@ public class ArchMonthAnalyzer extends ComponentTestCase {
 				      DailyReportEntity.READSET_FULL);
 
 				TransactionReport transactionReport = DefaultSaxParser.parse(report.getContent());
-				Machine machine = transactionReport.findOrCreateMachine(CatString.ALL);
+				Machine machine = transactionReport.findOrCreateMachine(ReportConstants.ALL);
 
 				Indicator indicator = indicators.get(date.getTime());
 				if (indicator == null) {

cat-home/src/test/java/com/dianping/cat/report/analyzer/ArchTransactionAnalyzer.java

@@ -26,9 +26,9 @@ import com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser;
 import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.DailyReportDao;
 import com.dianping.cat.core.dal.DailyReportEntity;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.service.ReportService;
+import com.dianping.cat.service.ReportConstants;
 
 @RunWith(JUnit4.class)
 public class ArchTransactionAnalyzer extends ComponentTestCase {
@@ -89,7 +89,7 @@ public class ArchTransactionAnalyzer extends ComponentTestCase {
 				      DailyReportEntity.READSET_FULL);
 				TransactionReport report = DefaultSaxParser.parse(dailyreport.getContent());
 
-				info.reset(report.findMachine(CatString.ALL));
+				info.reset(report.findMachine(ReportConstants.ALL));
 			} catch (DalNotFoundException e) {
 			} catch (Exception e) {
 				e.printStackTrace();

cat-home/src/test/java/com/dianping/cat/report/analyzer/ArchYearAnalyzer.java

@@ -19,7 +19,6 @@ import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.consumer.transaction.model.entity.Machine;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.service.ReportConstants;
@@ -89,7 +88,7 @@ public class ArchYearAnalyzer extends ComponentTestCase {
 		}
 
 		public void accept(TransactionReport report) {
-			Machine machine = report.findOrCreateMachine(CatString.ALL);
+			Machine machine = report.findOrCreateMachine(ReportConstants.ALL);
 			Collection<TransactionType> types = machine.getTypes().values();
 			for (TransactionType type : types) {
 				String name = type.getId();

cat-home/src/test/java/com/dianping/cat/report/analyzer/CatMonthAnalyzer.java

@@ -19,8 +19,8 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
 import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.DailyReportDao;
 import com.dianping.cat.core.dal.DailyReportEntity;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
+import com.dianping.cat.service.ReportConstants;
 
 @RunWith(JUnit4.class)
 public class CatMonthAnalyzer extends ComponentTestCase {
@@ -56,7 +56,7 @@ public class CatMonthAnalyzer extends ComponentTestCase {
 					TransactionReport report = com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser
 					      .parse(dailyreport.getContent());
 
-					Machine machine = report.findOrCreateMachine(CatString.ALL);
+					Machine machine = report.findOrCreateMachine(ReportConstants.ALL);
 					
 					TransactionType type =machine.findOrCreateType("URL");
 					

cat-home/src/test/java/com/dianping/cat/report/analyzer/DBAAnalyzer.java

@@ -20,7 +20,7 @@ import com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser;
 import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.MonthlyReportDao;
 import com.dianping.cat.core.dal.MonthlyReportEntity;
-import com.dianping.cat.helper.CatString;
+import com.dianping.cat.service.ReportConstants;
 
 public class DBAAnalyzer extends ComponentTestCase {
 
@@ -50,7 +50,7 @@ public class DBAAnalyzer extends ComponentTestCase {
 
 			
 			for (TransactionType type : machine.getTypes().values()) {
-				if(!machine.getIp().equals(CatString.ALL)){
+				if(!machine.getIp().equals(ReportConstants.ALL)){
 					TransactionType old = temp.findOrCreateType(type.getId());
 					m_merger.mergeType(old, type);
 				}

cat-home/src/test/java/com/dianping/cat/report/task/heavy/HeavyReportBuilderTest.java

@@ -9,7 +9,6 @@ import org.junit.Test;
 import org.unidal.lookup.ComponentTestCase;
 import org.unidal.webres.helper.Files;
 
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.home.heavy.entity.HeavyReport;
 import com.dianping.cat.home.heavy.transform.DefaultSaxParser;
@@ -24,10 +23,10 @@ public class HeavyReportBuilderTest extends ComponentTestCase {
 		Date date = new SimpleDateFormat("yyyyMMddHH").parse("2013082600");
 		for (int i = 0; i < 24; i++) {
 			Date current = new Date(date.getTime() + TimeUtil.ONE_HOUR * i);
-			builder.buildHourlyTask(ReportConstants.REPORT_HEAVY, CatString.CAT, current);
+			builder.buildHourlyTask(ReportConstants.REPORT_HEAVY, ReportConstants.CAT, current);
 		}
 		
-		builder.buildDailyTask(ReportConstants.REPORT_HEAVY,  CatString.CAT, date);
+		builder.buildDailyTask(ReportConstants.REPORT_HEAVY,  ReportConstants.CAT, date);
 	}
 
 	@Test

cat-home/src/test/java/com/dianping/cat/report/task/utilization/UtilizationBuilderTest.java

@@ -7,7 +7,6 @@ import org.unidal.lookup.ComponentTestCase;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.DomainManager;
-import com.dianping.cat.helper.CatString;
 import com.dianping.cat.service.ReportConstants;
 
 public class UtilizationBuilderTest extends ComponentTestCase{
@@ -19,7 +18,7 @@ public class UtilizationBuilderTest extends ComponentTestCase{
 		DomainManager manager = lookup(DomainManager.class);
 		
 		manager.initialize();
-		builder.buildHourlyTask(ReportConstants.REPORT_UTILIZATION,CatString.CAT, new SimpleDateFormat("yyyyMMddHH").parse("2013082617"));
+		builder.buildHourlyTask(ReportConstants.REPORT_UTILIZATION,ReportConstants.CAT, new SimpleDateFormat("yyyyMMddHH").parse("2013082617"));
 	}
 	
 	@Test
@@ -28,7 +27,7 @@ public class UtilizationBuilderTest extends ComponentTestCase{
 		DomainManager manager = lookup(DomainManager.class);
 		
 		manager.initialize();
-		builder.buildDailyTask(ReportConstants.REPORT_UTILIZATION, CatString.CAT, new SimpleDateFormat("yyyyMMdd").parse("20130826"));
+		builder.buildDailyTask(ReportConstants.REPORT_UTILIZATION, ReportConstants.CAT, new SimpleDateFormat("yyyyMMdd").parse("20130826"));
 	}
 
 	@Test
@@ -37,7 +36,7 @@ public class UtilizationBuilderTest extends ComponentTestCase{
 		DomainManager manager = lookup(DomainManager.class);
 		
 		manager.initialize();
-		builder.buildWeeklyTask(ReportConstants.REPORT_UTILIZATION, CatString.CAT, new SimpleDateFormat("yyyyMMdd").parse("20130717"));
+		builder.buildWeeklyTask(ReportConstants.REPORT_UTILIZATION, ReportConstants.CAT, new SimpleDateFormat("yyyyMMdd").parse("20130717"));
 	}
 	
 	@Test
@@ -46,7 +45,7 @@ public class UtilizationBuilderTest extends ComponentTestCase{
 		DomainManager manager = lookup(DomainManager.class);
 		
 		manager.initialize();
-		builder.buildMonthlyTask(ReportConstants.REPORT_UTILIZATION, CatString.CAT, new SimpleDateFormat("yyyyMMdd").parse("20130701"));
+		builder.buildMonthlyTask(ReportConstants.REPORT_UTILIZATION, ReportConstants.CAT, new SimpleDateFormat("yyyyMMdd").parse("20130701"));
 	}