refactor package

cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java

@@ -26,6 +26,7 @@ import com.dianping.cat.consumer.metric.MetricConfigManager;
 import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.core.config.ConfigDao;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.home.dal.report.TopologyGraphDao;
 import com.dianping.cat.home.dal.report.UserDefineRuleDao;
 import com.dianping.cat.report.graph.metric.CachedMetricReportService;
@@ -38,7 +39,6 @@ import com.dianping.cat.report.graph.svg.DefaultGraphBuilder;
 import com.dianping.cat.report.graph.svg.DefaultValueTranslater;
 import com.dianping.cat.report.graph.svg.GraphBuilder;
 import com.dianping.cat.report.graph.svg.ValueTranslater;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.dependency.graph.DependencyItemBuilder;
 import com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder;

cat-home/src/main/java/com/dianping/cat/report/page/JsonBuilder.java → cat-home/src/main/java/com/dianping/cat/helper/JsonBuilder.java

-package com.dianping.cat.report.page;
+package com.dianping.cat.helper;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;

cat-home/src/main/java/com/dianping/cat/report/page/LineChart.java → cat-home/src/main/java/com/dianping/cat/report/graph/LineChart.java

-package com.dianping.cat.report.page;
+package com.dianping.cat.report.graph;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -8,6 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.dianping.cat.helper.JsonBuilder;
+
 public class LineChart {
 
 	private transient SimpleDateFormat m_sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm");

cat-home/src/main/java/com/dianping/cat/report/page/PieChart.java → cat-home/src/main/java/com/dianping/cat/report/graph/PieChart.java

-package com.dianping.cat.report.page;
+package com.dianping.cat.report.graph;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import com.dianping.cat.helper.JsonBuilder;
+
 public class PieChart {
 
 	private String m_title;

cat-home/src/main/java/com/dianping/cat/report/graph/metric/AbstractGraphCreator.java

@@ -16,7 +16,7 @@ import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
 import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.service.BaselineService;
 import com.dianping.cat.report.task.alert.AlertInfo;
 

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

@@ -15,6 +15,7 @@ import org.unidal.web.mvc.ActionContext;
 import org.unidal.web.mvc.ViewModel;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.view.HistoryNav;
 import com.dianping.cat.report.view.UrlNav;

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

@@ -24,11 +24,11 @@ import com.dianping.cat.config.app.AppConfigManager;
 import com.dianping.cat.config.app.AppSpeedConfigManager;
 import com.dianping.cat.configuration.app.entity.Command;
 import com.dianping.cat.configuration.app.speed.entity.Speed;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.JsonBuilder;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
-import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.app.display.AppDataDetail;
 import com.dianping.cat.report.page.app.display.AppGraphCreator;
 import com.dianping.cat.report.page.app.display.AppSpeedDisplayInfo;

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

@@ -17,10 +17,10 @@ import com.dianping.cat.configuration.app.entity.Command;
 import com.dianping.cat.configuration.app.entity.Item;
 import com.dianping.cat.configuration.app.speed.entity.Speed;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
+import com.dianping.cat.helper.JsonBuilder;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.JsonBuilder;
-import com.dianping.cat.report.page.LineChart;
-import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.app.display.AppDataDetail;
 import com.dianping.cat.report.page.app.display.AppSpeedDetail;
 import com.dianping.cat.report.page.app.display.AppSpeedDisplayInfo;

cat-home/src/main/java/com/dianping/cat/report/page/app/display/AppGraphCreator.java

@@ -11,9 +11,9 @@ import org.unidal.tuple.Pair;
 import com.dianping.cat.app.AppCommandData;
 import com.dianping.cat.config.app.AppConfigManager;
 import com.dianping.cat.configuration.app.entity.Code;
-import com.dianping.cat.report.page.LineChart;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.service.app.AppDataField;
 import com.dianping.cat.report.service.app.AppDataService;
 import com.dianping.cat.report.service.app.CommandQueryEntity;

cat-home/src/main/java/com/dianping/cat/report/page/app/display/AppSpeedDisplayInfo.java

@@ -3,7 +3,7 @@ package com.dianping.cat.report.page.app.display;
 import java.util.List;
 import java.util.Map;
 
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 
 public class AppSpeedDisplayInfo {
 

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

@@ -15,7 +15,7 @@ import com.dianping.cat.consumer.event.model.entity.EventName;
 import com.dianping.cat.consumer.event.model.entity.EventType;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
-import com.dianping.cat.report.page.JsonBuilder;
+import com.dianping.cat.helper.JsonBuilder;
 
 public class CacheReport {
 

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

@@ -20,9 +20,9 @@ import com.dianping.cat.consumer.event.model.entity.EventReport;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.report.ReportPage;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.page.PayloadNormalizer;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
 import com.dianping.cat.report.page.cache.CacheReport.CacheNameItem;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.page.transaction.AllMachineMerger;

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

@@ -6,8 +6,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.LineChart;
 
 public class Model extends AbstractReportModel<Action, Context> {
 	private List<String> m_cities;

cat-home/src/main/java/com/dianping/cat/report/page/cdn/graph/CdnGraphCreator.java

@@ -11,8 +11,8 @@ 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.Segment;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.metric.AbstractGraphCreator;
-import com.dianping.cat.report.page.LineChart;
 
 public class CdnGraphCreator extends AbstractGraphCreator {
 

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

@@ -29,8 +29,8 @@ 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.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.page.event.EventMergeHelper;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.page.problem.ProblemStatistics;

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

@@ -9,8 +9,8 @@ import java.util.Map.Entry;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.helper.Chinese;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.metric.AbstractGraphCreator;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;
 import com.dianping.cat.report.task.alert.MetricType;
 

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

@@ -19,7 +19,7 @@ import com.dianping.cat.consumer.company.model.entity.ProductLine;
 import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
 
 public class Handler implements PageHandler<Context> {

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

@@ -10,8 +10,8 @@ import org.unidal.web.mvc.view.annotation.EntityMeta;
 import org.unidal.web.mvc.view.annotation.ModelMeta;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.metric.Range;
 
 @ModelMeta("database")

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

@@ -30,7 +30,7 @@ import com.dianping.cat.home.dependency.graph.entity.TopologyGraph;
 import com.dianping.cat.home.dependency.graph.entity.TopologyNode;
 import com.dianping.cat.home.dependency.graph.transform.DefaultJsonBuilder;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.dependency.graph.LineGraphBuilder;
 import com.dianping.cat.report.page.dependency.graph.ProductLinesDashboard;

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

@@ -16,8 +16,8 @@ import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
 import com.dianping.cat.consumer.dependency.model.entity.Segment;
 import com.dianping.cat.consumer.top.model.entity.TopReport;
 import com.dianping.cat.helper.SortHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.dependency.graph.ProductLinesDashboard;
 
 @ModelMeta(DependencyAnalyzer.ID)

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

@@ -16,7 +16,7 @@ import com.dianping.cat.consumer.dependency.model.entity.Index;
 import com.dianping.cat.consumer.dependency.model.entity.Segment;
 import com.dianping.cat.consumer.dependency.model.transform.BaseVisitor;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 
 public class LineGraphBuilder extends BaseVisitor {
 

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

@@ -8,9 +8,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.home.dependency.graph.entity.TopologyEdge;
 import com.dianping.cat.home.dependency.graph.entity.TopologyNode;
-import com.dianping.cat.report.page.JsonBuilder;
 
 public class ProductLinesDashboard {
 

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

@@ -19,12 +19,12 @@ 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.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.graph.svg.GraphBuilder;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.page.PayloadNormalizer;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
 import com.dianping.cat.report.page.event.DisplayNames.EventNameModel;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportServiceManager;

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

@@ -19,8 +19,8 @@ import com.dianping.cat.core.dal.Graph;
 import com.dianping.cat.core.dal.GraphDao;
 import com.dianping.cat.core.dal.GraphEntity;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.BaseHistoryGraphs;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.event.Handler.DetailOrder;
 import com.dianping.cat.report.page.event.Handler.SummaryOrder;
 

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

@@ -13,8 +13,8 @@ import com.dianping.cat.consumer.event.model.entity.EventName;
 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.transform.BaseVisitor;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 
 public class PieGraphChartVisitor extends BaseVisitor {
 

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

@@ -14,10 +14,10 @@ import com.dianping.cat.consumer.heartbeat.model.entity.Extension;
 import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport;
 import com.dianping.cat.consumer.heartbeat.model.entity.Machine;
 import com.dianping.cat.consumer.heartbeat.model.entity.Period;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.BaseHistoryGraphs;
-import com.dianping.cat.report.page.JsonBuilder;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.service.ReportServiceManager;
 import com.dianping.cat.system.config.HeartbeatDisplayPolicyManager;
 

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

@@ -21,8 +21,8 @@ import com.dianping.cat.consumer.productline.ProductLineConfig;
 import com.dianping.cat.core.dal.Project;
 import com.dianping.cat.helper.Chinese;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.metric.AbstractGraphCreator;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;
 import com.dianping.cat.report.task.alert.MetricType;
 import com.dianping.cat.service.ProjectService;

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

@@ -20,7 +20,7 @@ import com.dianping.cat.consumer.metric.MetricConfigManager;
 import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
 
 public class Handler implements PageHandler<Context> {

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

@@ -10,8 +10,8 @@ import org.unidal.web.mvc.view.annotation.ModelMeta;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.LineChart;
 
 @ModelMeta(MetricAnalyzer.ID)
 public class Model extends AbstractReportModel<Action, Context> {

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

@@ -13,13 +13,13 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.productline.ProductLineConfig;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Metric;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.message.internal.DefaultMetric;
 import com.dianping.cat.message.internal.DefaultTransaction;
 import com.dianping.cat.message.spi.MessageTree;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.task.alert.MetricType;
 
 public class Handler implements PageHandler<Context> {

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

@@ -12,8 +12,8 @@ import java.util.Set;
 import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.metric.AbstractGraphCreator;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;
 import com.dianping.cat.report.task.alert.MetricType;
 

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

@@ -20,7 +20,7 @@ import com.dianping.cat.consumer.company.model.entity.ProductLine;
 import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.network.nettopology.NetGraphManager;
 import com.dianping.cat.service.ModelPeriod;

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

@@ -10,8 +10,8 @@ import org.unidal.web.mvc.view.annotation.EntityMeta;
 import org.unidal.web.mvc.view.annotation.ModelMeta;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.metric.Range;
 
 @ModelMeta("network")

cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java

@@ -21,6 +21,7 @@ import com.dianping.cat.Cat;
 import com.dianping.cat.Constants;
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.network.entity.Connection;
 import com.dianping.cat.home.network.entity.Interface;
@@ -28,7 +29,6 @@ import com.dianping.cat.home.network.entity.NetGraph;
 import com.dianping.cat.home.network.entity.NetGraphSet;
 import com.dianping.cat.home.network.entity.NetTopology;
 import com.dianping.cat.message.Transaction;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
 import com.dianping.cat.report.task.alert.AlertInfo;
 import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;

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

@@ -24,8 +24,8 @@ import com.dianping.cat.configuration.server.entity.Domain;
 import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.model.entity.Machine;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportServiceManager;

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

@@ -19,8 +19,8 @@ import com.dianping.cat.core.dal.Graph;
 import com.dianping.cat.core.dal.GraphDao;
 import com.dianping.cat.core.dal.GraphEntity;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.BaseHistoryGraphs;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.problem.Handler.DetailOrder;
 import com.dianping.cat.report.page.problem.Handler.SummaryOrder;
 

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

@@ -12,7 +12,7 @@ import com.dianping.cat.consumer.problem.model.entity.Machine;
 import com.dianping.cat.consumer.problem.model.entity.Segment;
 import com.dianping.cat.consumer.problem.model.transform.BaseVisitor;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 
 public class HourlyLineChartVisitor extends BaseVisitor {
 

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

@@ -14,8 +14,8 @@ 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.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 
 public class PieGraphChartVisitor extends BaseVisitor {
 

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

@@ -17,11 +17,11 @@ import com.dianping.cat.Constants;
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.consumer.state.StateAnalyzer;
 import com.dianping.cat.consumer.state.model.entity.StateReport;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.JsonBuilder;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
-import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportServiceManager;
 import com.dianping.cat.service.ModelRequest;

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

@@ -12,9 +12,9 @@ import org.unidal.tuple.Pair;
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.consumer.state.model.entity.StateReport;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.page.LineChart;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.service.ReportServiceManager;
 
 public class StateGraphBuilder {

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

@@ -9,6 +9,7 @@ import org.unidal.web.mvc.view.annotation.EntityMeta;
 import org.unidal.web.mvc.view.annotation.ModelMeta;
 
 import com.dianping.cat.Constants;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.home.alert.report.entity.AlertReport;
 import com.dianping.cat.home.bug.entity.BugReport;
 import com.dianping.cat.home.bug.transform.DefaultJsonBuilder;
@@ -21,7 +22,6 @@ import com.dianping.cat.home.service.entity.ServiceReport;
 import com.dianping.cat.home.system.entity.SystemReport;
 import com.dianping.cat.home.utilization.entity.UtilizationReport;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.JsonBuilder;
 
 @ModelMeta("statistics")
 public class Model extends AbstractReportModel<Action, Context> {

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

@@ -22,7 +22,7 @@ import com.dianping.cat.consumer.productline.ProductLineConfig;
 import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.page.system.graph.SystemGraphCreator;
 

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

@@ -8,8 +8,8 @@ import java.util.List;
 import org.unidal.web.mvc.view.annotation.EntityMeta;
 import org.unidal.web.mvc.view.annotation.ModelMeta;
 
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.metric.Range;
 
 @ModelMeta("system")

cat-home/src/main/java/com/dianping/cat/report/page/system/graph/SystemGraphCreator.java

@@ -15,8 +15,8 @@ import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.consumer.metric.model.entity.Statistic;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.metric.AbstractGraphCreator;
-import com.dianping.cat.report.page.LineChart;
 
 public class SystemGraphCreator extends AbstractGraphCreator {
 

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

@@ -19,12 +19,12 @@ 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.JsonBuilder;
 import com.dianping.cat.report.ReportPage;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.graph.svg.GraphBuilder;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.page.PayloadNormalizer;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.page.transaction.DisplayNames.TransactionNameModel;
 import com.dianping.cat.report.page.transaction.GraphPayload.AverageTimePayload;

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

@@ -19,8 +19,8 @@ import com.dianping.cat.core.dal.Graph;
 import com.dianping.cat.core.dal.GraphDao;
 import com.dianping.cat.core.dal.GraphEntity;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.BaseHistoryGraphs;
-import com.dianping.cat.report.page.LineChart;
 import com.dianping.cat.report.page.transaction.Handler.DetailOrder;
 import com.dianping.cat.report.page.transaction.Handler.SummaryOrder;
 

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

@@ -13,8 +13,8 @@ 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.TransactionType;
 import com.dianping.cat.consumer.transaction.model.transform.BaseVisitor;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 
 public class PieGraphChartVisitor extends BaseVisitor {
 

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

@@ -11,7 +11,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationExce
 import org.unidal.helper.Files;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.page.JsonBuilder;
+import com.dianping.cat.helper.JsonBuilder;
 
 public class CityManager implements Initializable {
 

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

@@ -28,12 +28,12 @@ import com.dianping.cat.config.url.UrlPatternConfigManager;
 import com.dianping.cat.configuration.url.pattern.entity.PatternItem;
 import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.report.page.JsonBuilder;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
 import com.dianping.cat.report.page.PayloadNormalizer;
-import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.page.problem.ProblemStatistics;
 import com.dianping.cat.report.page.web.graph.WebGraphCreator;

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

@@ -11,11 +11,11 @@ import org.unidal.web.mvc.view.annotation.EntityMeta;
 
 import com.dianping.cat.configuration.url.pattern.entity.PatternItem;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.helper.SortHelper;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
 import com.dianping.cat.report.page.AbstractReportModel;
-import com.dianping.cat.report.page.JsonBuilder;
-import com.dianping.cat.report.page.LineChart;
-import com.dianping.cat.report.page.PieChart;
 import com.dianping.cat.report.page.problem.ProblemStatistics;
 
 public class Model extends AbstractReportModel<Action, Context> {

cat-home/src/main/java/com/dianping/cat/report/page/web/graph/WebGraphCreator.java

@@ -17,10 +17,10 @@ import com.dianping.cat.consumer.metric.model.entity.Segment;
 import com.dianping.cat.consumer.metric.model.entity.Statistic;
 import com.dianping.cat.consumer.metric.model.entity.StatisticsItem;
 import com.dianping.cat.helper.TimeHelper;
+import com.dianping.cat.report.graph.LineChart;
+import com.dianping.cat.report.graph.PieChart;
+import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.graph.metric.AbstractGraphCreator;
-import com.dianping.cat.report.page.LineChart;
-import com.dianping.cat.report.page.PieChart;
-import com.dianping.cat.report.page.PieChart.Item;
 import com.dianping.cat.report.page.model.metric.MetricReportMerger;
 import com.dianping.cat.report.page.web.Handler.QueryEntity;
 

cat-home/src/main/java/com/dianping/cat/report/service/app/AppSpeedService.java

@@ -15,7 +15,7 @@ import com.dianping.cat.Cat;
 import com.dianping.cat.app.AppSpeedData;
 import com.dianping.cat.app.AppSpeedDataDao;
 import com.dianping.cat.app.AppSpeedDataEntity;
-import com.dianping.cat.report.page.LineChart;
+import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.app.display.AppDataSequence;
 import com.dianping.cat.report.page.app.display.AppSpeedDetail;
 import com.dianping.cat.report.page.app.display.AppSpeedDisplayInfo;

cat-home/src/main/java/com/dianping/cat/report/task/alert/summary/FailureSummaryContentGenerator.java

@@ -10,7 +10,7 @@ import org.unidal.lookup.annotation.Inject;
 import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
-import com.dianping.cat.report.page.PieChart.Item;
+import com.dianping.cat.report.graph.PieChart.Item;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.page.problem.PieGraphChartVisitor;
 import com.dianping.cat.report.page.problem.ProblemStatistics;

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

@@ -13,11 +13,11 @@ import com.dianping.cat.config.content.ContentFetcher;
 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.JsonBuilder;
 import com.dianping.cat.home.group.entity.Domain;
 import com.dianping.cat.home.group.entity.DomainGroup;
 import com.dianping.cat.home.group.entity.Group;
 import com.dianping.cat.home.group.transform.DefaultSaxParser;
-import com.dianping.cat.report.page.JsonBuilder;
 
 public class DomainGroupConfigManager implements Initializable {
 

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

@@ -13,10 +13,10 @@ import com.dianping.cat.config.content.ContentFetcher;
 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.JsonBuilder;
 import com.dianping.cat.home.dependency.format.entity.ProductLine;
 import com.dianping.cat.home.dependency.format.entity.TopoGraphFormatConfig;
 import com.dianping.cat.home.dependency.format.transform.DefaultSaxParser;
-import com.dianping.cat.report.page.JsonBuilder;
 
 public class TopoGraphFormatConfigManager implements Initializable {
 

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

@@ -15,9 +15,9 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 import org.unidal.web.mvc.annotation.PreInboundActionMeta;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.home.dal.report.ConfigModification;
 import com.dianping.cat.home.dal.report.ConfigModificationDao;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.system.SystemPage;
 import com.dianping.cat.system.page.config.processor.AlertConfigProcessor;
 import com.dianping.cat.system.page.config.processor.AppConfigProcessor;

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

@@ -21,6 +21,7 @@ import com.dianping.cat.consumer.company.model.entity.Domain;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
 import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig;
 import com.dianping.cat.core.dal.Project;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.home.alert.thirdparty.entity.Http;
 import com.dianping.cat.home.alert.thirdparty.entity.Socket;
 import com.dianping.cat.home.alert.thirdparty.entity.ThirdPartyConfig;
@@ -32,7 +33,6 @@ import com.dianping.cat.home.exception.entity.ExceptionExclude;
 import com.dianping.cat.home.exception.entity.ExceptionLimit;
 import com.dianping.cat.home.group.entity.DomainGroup;
 import com.dianping.cat.home.rule.entity.Rule;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.page.web.CityManager.City;
 import com.dianping.cat.system.SystemPage;
 import com.dianping.cat.system.page.config.processor.BaseProcesser.RuleItem;

cat-home/src/test/java/com/dianping/cat/report/page/cache/CacheOutputTest.java

@@ -14,8 +14,8 @@ import org.unidal.lookup.ComponentTestCase;
 import com.dianping.cat.consumer.event.model.entity.EventReport;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
+import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.page.JsonBuilder;
 import com.dianping.cat.report.page.cache.CacheReport.CacheNameItem;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportServiceManager;