modify the report package

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

@@ -38,6 +38,8 @@ import com.dianping.cat.report.service.ReportServiceManager;
 import com.dianping.cat.report.service.app.AppDataService;
 import com.dianping.cat.report.service.impl.DefaultBaselineService;
 import com.dianping.cat.report.task.DefaultTaskConsumer;
+import com.dianping.cat.report.task.ReportFacade;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.alert.exception.AlertReportBuilder;
 import com.dianping.cat.report.task.alert.sender.sender.SenderManager;
 import com.dianping.cat.report.task.bug.BugReportBuilder;
@@ -80,8 +82,6 @@ import com.dianping.cat.report.task.problem.ProblemMerger;
 import com.dianping.cat.report.task.problem.ProblemReportBuilder;
 import com.dianping.cat.report.task.router.RouterConfigBuilder;
 import com.dianping.cat.report.task.service.ServiceReportBuilder;
-import com.dianping.cat.report.task.spi.ReportFacade;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 import com.dianping.cat.report.task.state.StateReportBuilder;
 import com.dianping.cat.report.task.system.SystemReportBuilder;
 import com.dianping.cat.report.task.transaction.TransactionGraphCreator;

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

@@ -15,7 +15,6 @@ import com.dianping.cat.core.dal.Task;
 import com.dianping.cat.core.dal.TaskDao;
 import com.dianping.cat.core.dal.TaskEntity;
 import com.dianping.cat.message.Transaction;
-import com.dianping.cat.report.task.spi.ReportFacade;
 
 public class DefaultTaskConsumer extends TaskConsumer {
 

cat-home/src/main/java/com/dianping/cat/report/task/spi/GraphLine.java → cat-home/src/main/java/com/dianping/cat/report/task/GraphLine.java

-package com.dianping.cat.report.task.spi;
+package com.dianping.cat.report.task;
 
 public final class GraphLine {
 	public long failCount;

cat-home/src/main/java/com/dianping/cat/report/task/spi/ReportFacade.java → cat-home/src/main/java/com/dianping/cat/report/task/ReportFacade.java

-package com.dianping.cat.report.task.spi;
+package com.dianping.cat.report.task;
 
 import java.util.Date;
 import java.util.HashMap;

cat-home/src/main/java/com/dianping/cat/report/task/spi/TaskBuilder.java → cat-home/src/main/java/com/dianping/cat/report/task/TaskBuilder.java

-package com.dianping.cat.report.task.spi;
+package com.dianping.cat.report.task;
 
 import java.util.Date;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/exception/AlertReportBuilder.java

@@ -17,8 +17,8 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.alert.report.entity.AlertReport;
 import com.dianping.cat.home.alert.report.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 import com.dianping.cat.system.config.ExceptionRuleConfigManager;
 
 public class AlertReportBuilder implements TaskBuilder {

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

@@ -21,8 +21,8 @@ import com.dianping.cat.home.bug.entity.BugReport;
 import com.dianping.cat.home.bug.entity.Domain;
 import com.dianping.cat.home.bug.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class BugReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/cached/CachedReportBuilder.java

@@ -6,7 +6,7 @@ import org.unidal.helper.Threads;
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Constants;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class CachedReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/cmdb/CmdbInfoReloadBuilder.java

@@ -6,7 +6,7 @@ import org.unidal.helper.Threads;
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Constants;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class CmdbInfoReloadBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/cross/CrossReportBuilder.java

@@ -16,8 +16,8 @@ import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class CrossReportBuilder implements TaskBuilder {
 	

cat-home/src/main/java/com/dianping/cat/report/task/database/AppDatabasePruner.java

@@ -18,7 +18,7 @@ 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.message.Transaction;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class AppDatabasePruner implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/dependency/DependencyReportBuilder.java

@@ -17,7 +17,7 @@ import com.dianping.cat.home.dependency.graph.entity.TopologyGraph;
 import com.dianping.cat.home.dependency.graph.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.page.dependency.graph.TopologyGraphBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class DependencyReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/event/EventGraphCreator.java

@@ -14,7 +14,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.core.dal.Graph;
-import com.dianping.cat.report.task.spi.GraphLine;
+import com.dianping.cat.report.task.GraphLine;
 
 public class EventGraphCreator {
 

cat-home/src/main/java/com/dianping/cat/report/task/event/EventReportBuilder.java

@@ -23,8 +23,8 @@ import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class EventReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/heartbeat/HeartbeatReportBuilder.java

@@ -15,8 +15,8 @@ import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.core.dal.GraphDao;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class HeartbeatReportBuilder implements TaskBuilder {
 

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

@@ -19,8 +19,8 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.heavy.entity.HeavyReport;
 import com.dianping.cat.home.heavy.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class HeavyReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/highload/HighLoadReportBuilder.java

@@ -24,7 +24,7 @@ import com.dianping.cat.home.highload.entity.Name;
 import com.dianping.cat.home.highload.entity.Type;
 import com.dianping.cat.home.highload.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.service.ProjectService;
 
 public class HighLoadReportBuilder implements TaskBuilder {

cat-home/src/main/java/com/dianping/cat/report/task/jar/JarReportBuilder.java

@@ -24,7 +24,7 @@ import com.dianping.cat.home.jar.entity.Jar;
 import com.dianping.cat.home.jar.entity.JarReport;
 import com.dianping.cat.home.jar.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class JarReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/matrix/MatrixReportBuilder.java

@@ -17,8 +17,8 @@ import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class MatrixReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/metric/MetricBaselineReportBuilder.java

@@ -21,8 +21,8 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.dal.report.Baseline;
 import com.dianping.cat.report.service.BaselineService;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.alert.MetricType;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class MetricBaselineReportBuilder implements TaskBuilder, LogEnabled {
 

cat-home/src/main/java/com/dianping/cat/report/task/network/NetTopologyReportBuilder.java

@@ -22,8 +22,8 @@ import com.dianping.cat.home.network.entity.NetTopology;
 import com.dianping.cat.home.network.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.page.network.nettopology.NetGraphBuilder;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 import com.dianping.cat.system.config.NetGraphConfigManager;
 
 public class NetTopologyReportBuilder implements TaskBuilder {

cat-home/src/main/java/com/dianping/cat/report/task/notify/NotifyTaskBuilder.java

@@ -18,10 +18,10 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.alert.sender.AlertChannel;
 import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
 import com.dianping.cat.report.task.alert.sender.sender.SenderManager;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 import com.dianping.cat.service.ProjectService;
 
 public class NotifyTaskBuilder implements TaskBuilder {

cat-home/src/main/java/com/dianping/cat/report/task/overload/CapacityUpdateTask.java

@@ -9,7 +9,7 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.Constants;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class CapacityUpdateTask implements TaskBuilder, LogEnabled {
 

cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemGraphCreator.java

@@ -17,8 +17,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.core.dal.Graph;
+import com.dianping.cat.report.task.GraphLine;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.GraphLine;
 
 public class ProblemGraphCreator {
 

cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemReportBuilder.java

@@ -24,8 +24,8 @@ import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class ProblemReportBuilder implements TaskBuilder {
 	

cat-home/src/main/java/com/dianping/cat/report/task/router/RouterConfigBuilder.java

@@ -28,7 +28,7 @@ import com.dianping.cat.home.router.entity.Server;
 import com.dianping.cat.home.router.transform.DefaultNativeBuilder;
 import com.dianping.cat.message.Event;
 import com.dianping.cat.report.service.ReportServiceManager;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.system.config.RouterConfigManager;
 
 public class RouterConfigBuilder implements TaskBuilder, LogEnabled {

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

@@ -25,8 +25,8 @@ import com.dianping.cat.home.service.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.page.cross.display.ProjectInfo;
 import com.dianping.cat.report.page.cross.display.TypeDetailInfo;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class ServiceReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/state/StateReportBuilder.java

@@ -20,8 +20,8 @@ import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 import com.dianping.cat.service.HostinfoService;
 import com.dianping.cat.service.ProjectService;
 

cat-home/src/main/java/com/dianping/cat/report/task/system/SystemReportBuilder.java

@@ -17,7 +17,7 @@ import com.dianping.cat.home.system.entity.SystemReport;
 import com.dianping.cat.home.system.transform.DefaultNativeBuilder;
 import com.dianping.cat.report.graph.metric.CachedMetricReportService;
 import com.dianping.cat.report.service.ReportServiceManager;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class SystemReportBuilder implements TaskBuilder {
 

cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionGraphCreator.java

@@ -17,7 +17,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.core.dal.Graph;
-import com.dianping.cat.report.task.spi.GraphLine;
+import com.dianping.cat.report.task.GraphLine;
 
 public class TransactionGraphCreator {
 

cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionReportBuilder.java

@@ -25,8 +25,8 @@ import com.dianping.cat.core.dal.MonthlyReport;
 import com.dianping.cat.core.dal.WeeklyReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class TransactionReportBuilder implements TaskBuilder, LogEnabled {
 

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

@@ -27,8 +27,8 @@ import com.dianping.cat.report.page.cross.display.ProjectInfo;
 import com.dianping.cat.report.page.cross.display.TypeDetailInfo;
 import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
 import com.dianping.cat.report.service.ReportServiceManager;
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.TaskHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class UtilizationReportBuilder implements TaskBuilder {
 

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

@@ -3,8 +3,8 @@ package com.dianping.cat.report.analyzer;
 import org.junit.Test;
 import org.unidal.lookup.ComponentTestCase;
 
+import com.dianping.cat.report.task.TaskBuilder;
 import com.dianping.cat.report.task.overload.CapacityUpdateTask;
-import com.dianping.cat.report.task.spi.TaskBuilder;
 
 public class CapacityAnalyzer extends ComponentTestCase {
 

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

@@ -12,7 +12,7 @@ import com.dianping.cat.Constants;
 import com.dianping.cat.core.dal.Task;
 import com.dianping.cat.home.router.entity.RouterConfig;
 import com.dianping.cat.report.service.ReportServiceManager;
-import com.dianping.cat.report.task.spi.ReportFacade;
+import com.dianping.cat.report.task.ReportFacade;
 
 public class RouterBuilderTest extends ComponentTestCase {
 

cat-home/src/test/java/com/dianping/cat/report/task/database/AppDatabasePrunerTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 import org.unidal.dal.jdbc.DalException;
 import org.unidal.lookup.ComponentTestCase;
 
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class AppDatabasePrunerTest extends ComponentTestCase {
 

cat-home/src/test/java/com/dianping/cat/report/task/heartbeat/HeartBeatReportBuilderTest.java

@@ -4,7 +4,7 @@ import org.unidal.lookup.ComponentTestCase;
 
 import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class HeartBeatReportBuilderTest extends ComponentTestCase {
 

cat-home/src/test/java/com/dianping/cat/report/task/highload/HighloadBuilderTest.java

@@ -4,7 +4,7 @@ import org.unidal.lookup.ComponentTestCase;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class HighloadBuilderTest extends ComponentTestCase {
 

cat-home/src/test/java/com/dianping/cat/report/task/jar/JarReportBuilderTest.java

@@ -8,7 +8,7 @@ import org.junit.Test;
 import org.unidal.lookup.ComponentTestCase;
 
 import com.dianping.cat.Constants;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class JarReportBuilderTest  extends ComponentTestCase{
 

cat-home/src/test/java/com/dianping/cat/report/task/router/RouterReportBuilderTest.java

@@ -8,7 +8,7 @@ import org.junit.Test;
 import org.unidal.lookup.ComponentTestCase;
 
 import com.dianping.cat.Constants;
-import com.dianping.cat.report.task.spi.TaskBuilder;
+import com.dianping.cat.report.task.TaskBuilder;
 
 public class RouterReportBuilderTest  extends ComponentTestCase{