refactor code and fix test error

cat-consumer/src/test/java/com/dianping/cat/consumer/cross/CrossInfoTest.java

@@ -47,7 +47,7 @@ public class CrossInfoTest extends ComponentTestCase {
 		CrossInfo info = analyzer.parseCorssTransaction(t, tree);
 
 		Assert.assertEquals(info.getLocalAddress(), "192.168.0.1");
-		Assert.assertEquals(info.getRemoteAddress(), "Unknown");
+		Assert.assertEquals(info.getRemoteAddress(), null);
 
 		Message message = new DefaultEvent("PigeonCall.server", "10.1.1.1", null);
 		Message messageApp = new DefaultEvent("PigeonCall.app", "myDomain", null);
@@ -74,7 +74,7 @@ public class CrossInfoTest extends ComponentTestCase {
 		MessageTree tree = buildMockMessageTree();
 		CrossInfo info = analyzer.parseCorssTransaction(t, tree);
 
-		Assert.assertEquals(info,null);
+		Assert.assertEquals(info.validate(), false);
 
 		Message message = new DefaultEvent("PigeonService.client", "192.168.7.71", null);
 		Message messageApp = new DefaultEvent("PigeonService.app", "myDomain", null);

cat-home/src/main/java/com/dianping/cat/CatHomeModule.java

@@ -12,18 +12,18 @@ import com.dianping.cat.consumer.CatConsumerModule;
 import com.dianping.cat.message.spi.core.MessageConsumer;
 import com.dianping.cat.message.spi.core.TcpSocketReceiver;
 import com.dianping.cat.report.task.DefaultTaskConsumer;
-import com.dianping.cat.report.task.alert.app.AppAlert;
-import com.dianping.cat.report.task.alert.business.BusinessAlert;
-import com.dianping.cat.report.task.alert.database.DatabaseAlert;
-import com.dianping.cat.report.task.alert.exception.ExceptionAlert;
-import com.dianping.cat.report.task.alert.exception.FrontEndExceptionAlert;
-import com.dianping.cat.report.task.alert.heartbeat.HeartbeatAlert;
-import com.dianping.cat.report.task.alert.network.NetworkAlert;
-import com.dianping.cat.report.task.alert.system.SystemAlert;
-import com.dianping.cat.report.task.alert.thirdParty.ThirdPartyAlert;
-import com.dianping.cat.report.task.alert.thirdParty.ThirdPartyAlertBuilder;
-import com.dianping.cat.report.task.alert.transaction.TransactionAlert;
-import com.dianping.cat.report.task.alert.web.WebAlert;
+import com.dianping.cat.report.alert.app.AppAlert;
+import com.dianping.cat.report.alert.business.BusinessAlert;
+import com.dianping.cat.report.alert.database.DatabaseAlert;
+import com.dianping.cat.report.alert.exception.ExceptionAlert;
+import com.dianping.cat.report.alert.exception.FrontEndExceptionAlert;
+import com.dianping.cat.report.alert.heartbeat.HeartbeatAlert;
+import com.dianping.cat.report.alert.network.NetworkAlert;
+import com.dianping.cat.report.alert.system.SystemAlert;
+import com.dianping.cat.report.alert.thirdParty.ThirdPartyAlert;
+import com.dianping.cat.report.alert.thirdParty.ThirdPartyAlertBuilder;
+import com.dianping.cat.report.alert.transaction.TransactionAlert;
+import com.dianping.cat.report.alert.web.WebAlert;
 import com.dianping.cat.system.config.ConfigReloadTask;
 
 public class CatHomeModule extends AbstractModule {

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

@@ -26,69 +26,69 @@ import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
 import com.dianping.cat.report.service.BaselineService;
 import com.dianping.cat.report.service.app.AppDataService;
-import com.dianping.cat.report.task.alert.AlertInfo;
-import com.dianping.cat.report.task.alert.DataChecker;
-import com.dianping.cat.report.task.alert.DefaultDataChecker;
-import com.dianping.cat.report.task.alert.RemoteMetricReportService;
-import com.dianping.cat.report.task.alert.app.AppAlert;
-import com.dianping.cat.report.task.alert.business.BusinessAlert;
-import com.dianping.cat.report.task.alert.database.DatabaseAlert;
-import com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder;
-import com.dianping.cat.report.task.alert.exception.ExceptionAlert;
-import com.dianping.cat.report.task.alert.exception.FrontEndExceptionAlert;
-import com.dianping.cat.report.task.alert.heartbeat.HeartbeatAlert;
-import com.dianping.cat.report.task.alert.network.NetworkAlert;
-import com.dianping.cat.report.task.alert.sender.AlertManager;
-import com.dianping.cat.report.task.alert.sender.decorator.AppDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.BusinessDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.DatabaseDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.Decorator;
-import com.dianping.cat.report.task.alert.sender.decorator.DecoratorManager;
-import com.dianping.cat.report.task.alert.sender.decorator.ExceptionDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.FrontEndExceptionDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.HeartbeatDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.NetworkDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.SystemDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.ThirdpartyDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.TransactionDecorator;
-import com.dianping.cat.report.task.alert.sender.decorator.WebDecorator;
-import com.dianping.cat.report.task.alert.sender.receiver.AppContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.BusinessContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.Contactor;
-import com.dianping.cat.report.task.alert.sender.receiver.ContactorManager;
-import com.dianping.cat.report.task.alert.sender.receiver.DatabaseContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.ExceptionContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.FrontEndExceptionContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.HeartbeatContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.NetworkContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.SystemContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.ThirdpartyContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.TransactionContactor;
-import com.dianping.cat.report.task.alert.sender.receiver.WebContactor;
-import com.dianping.cat.report.task.alert.sender.sender.MailSender;
-import com.dianping.cat.report.task.alert.sender.sender.Sender;
-import com.dianping.cat.report.task.alert.sender.sender.SenderManager;
-import com.dianping.cat.report.task.alert.sender.sender.SmsSender;
-import com.dianping.cat.report.task.alert.sender.sender.WeixinSender;
-import com.dianping.cat.report.task.alert.sender.spliter.MailSpliter;
-import com.dianping.cat.report.task.alert.sender.spliter.SmsSpliter;
-import com.dianping.cat.report.task.alert.sender.spliter.Spliter;
-import com.dianping.cat.report.task.alert.sender.spliter.SpliterManager;
-import com.dianping.cat.report.task.alert.sender.spliter.WeixinSpliter;
-import com.dianping.cat.report.task.alert.service.AlertEntityService;
-import com.dianping.cat.report.task.alert.summary.AlertSummaryContentGenerator;
-import com.dianping.cat.report.task.alert.summary.AlertSummaryExecutor;
-import com.dianping.cat.report.task.alert.summary.AlertSummaryGenerator;
-import com.dianping.cat.report.task.alert.summary.AlertSummaryManager;
-import com.dianping.cat.report.task.alert.summary.AlterationSummaryContentGenerator;
-import com.dianping.cat.report.task.alert.summary.FailureSummaryContentGenerator;
-import com.dianping.cat.report.task.alert.summary.SummaryContentGenerator;
-import com.dianping.cat.report.task.alert.system.SystemAlert;
-import com.dianping.cat.report.task.alert.thirdParty.HttpConnector;
-import com.dianping.cat.report.task.alert.thirdParty.ThirdPartyAlert;
-import com.dianping.cat.report.task.alert.thirdParty.ThirdPartyAlertBuilder;
-import com.dianping.cat.report.task.alert.transaction.TransactionAlert;
-import com.dianping.cat.report.task.alert.web.WebAlert;
+import com.dianping.cat.report.alert.AlertInfo;
+import com.dianping.cat.report.alert.DataChecker;
+import com.dianping.cat.report.alert.DefaultDataChecker;
+import com.dianping.cat.report.alert.RemoteMetricReportService;
+import com.dianping.cat.report.alert.app.AppAlert;
+import com.dianping.cat.report.alert.business.BusinessAlert;
+import com.dianping.cat.report.alert.database.DatabaseAlert;
+import com.dianping.cat.report.alert.exception.AlertExceptionBuilder;
+import com.dianping.cat.report.alert.exception.ExceptionAlert;
+import com.dianping.cat.report.alert.exception.FrontEndExceptionAlert;
+import com.dianping.cat.report.alert.heartbeat.HeartbeatAlert;
+import com.dianping.cat.report.alert.network.NetworkAlert;
+import com.dianping.cat.report.alert.sender.AlertManager;
+import com.dianping.cat.report.alert.sender.decorator.AppDecorator;
+import com.dianping.cat.report.alert.sender.decorator.BusinessDecorator;
+import com.dianping.cat.report.alert.sender.decorator.DatabaseDecorator;
+import com.dianping.cat.report.alert.sender.decorator.Decorator;
+import com.dianping.cat.report.alert.sender.decorator.DecoratorManager;
+import com.dianping.cat.report.alert.sender.decorator.ExceptionDecorator;
+import com.dianping.cat.report.alert.sender.decorator.FrontEndExceptionDecorator;
+import com.dianping.cat.report.alert.sender.decorator.HeartbeatDecorator;
+import com.dianping.cat.report.alert.sender.decorator.NetworkDecorator;
+import com.dianping.cat.report.alert.sender.decorator.SystemDecorator;
+import com.dianping.cat.report.alert.sender.decorator.ThirdpartyDecorator;
+import com.dianping.cat.report.alert.sender.decorator.TransactionDecorator;
+import com.dianping.cat.report.alert.sender.decorator.WebDecorator;
+import com.dianping.cat.report.alert.sender.receiver.AppContactor;
+import com.dianping.cat.report.alert.sender.receiver.BusinessContactor;
+import com.dianping.cat.report.alert.sender.receiver.Contactor;
+import com.dianping.cat.report.alert.sender.receiver.ContactorManager;
+import com.dianping.cat.report.alert.sender.receiver.DatabaseContactor;
+import com.dianping.cat.report.alert.sender.receiver.ExceptionContactor;
+import com.dianping.cat.report.alert.sender.receiver.FrontEndExceptionContactor;
+import com.dianping.cat.report.alert.sender.receiver.HeartbeatContactor;
+import com.dianping.cat.report.alert.sender.receiver.NetworkContactor;
+import com.dianping.cat.report.alert.sender.receiver.SystemContactor;
+import com.dianping.cat.report.alert.sender.receiver.ThirdpartyContactor;
+import com.dianping.cat.report.alert.sender.receiver.TransactionContactor;
+import com.dianping.cat.report.alert.sender.receiver.WebContactor;
+import com.dianping.cat.report.alert.sender.sender.MailSender;
+import com.dianping.cat.report.alert.sender.sender.Sender;
+import com.dianping.cat.report.alert.sender.sender.SenderManager;
+import com.dianping.cat.report.alert.sender.sender.SmsSender;
+import com.dianping.cat.report.alert.sender.sender.WeixinSender;
+import com.dianping.cat.report.alert.sender.spliter.MailSpliter;
+import com.dianping.cat.report.alert.sender.spliter.SmsSpliter;
+import com.dianping.cat.report.alert.sender.spliter.Spliter;
+import com.dianping.cat.report.alert.sender.spliter.SpliterManager;
+import com.dianping.cat.report.alert.sender.spliter.WeixinSpliter;
+import com.dianping.cat.report.alert.service.AlertEntityService;
+import com.dianping.cat.report.alert.summary.AlertSummaryContentGenerator;
+import com.dianping.cat.report.alert.summary.AlertSummaryExecutor;
+import com.dianping.cat.report.alert.summary.AlertSummaryGenerator;
+import com.dianping.cat.report.alert.summary.AlertSummaryManager;
+import com.dianping.cat.report.alert.summary.AlterationSummaryContentGenerator;
+import com.dianping.cat.report.alert.summary.FailureSummaryContentGenerator;
+import com.dianping.cat.report.alert.summary.SummaryContentGenerator;
+import com.dianping.cat.report.alert.system.SystemAlert;
+import com.dianping.cat.report.alert.thirdParty.HttpConnector;
+import com.dianping.cat.report.alert.thirdParty.ThirdPartyAlert;
+import com.dianping.cat.report.alert.thirdParty.ThirdPartyAlertBuilder;
+import com.dianping.cat.report.alert.transaction.TransactionAlert;
+import com.dianping.cat.report.alert.web.WebAlert;
 import com.dianping.cat.service.ProjectService;
 import com.dianping.cat.system.config.AlertConfigManager;
 import com.dianping.cat.system.config.AlertPolicyManager;

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

@@ -50,7 +50,7 @@ import com.dianping.cat.report.service.ReportService;
 import com.dianping.cat.report.service.ReportServiceManager;
 import com.dianping.cat.report.service.app.AppDataService;
 import com.dianping.cat.report.service.app.AppSpeedService;
-import com.dianping.cat.report.task.alert.AlertInfo;
+import com.dianping.cat.report.alert.AlertInfo;
 import com.dianping.cat.report.task.cmdb.ProjectUpdateTask;
 import com.dianping.cat.service.HostinfoService;
 import com.dianping.cat.service.IpService;

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

@@ -40,8 +40,8 @@ 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.alert.exception.AlertReportBuilder;
+import com.dianping.cat.report.alert.sender.sender.SenderManager;
 import com.dianping.cat.report.task.bug.BugReportBuilder;
 import com.dianping.cat.report.task.cached.CachedReportBuilder;
 import com.dianping.cat.report.task.cached.CachedReportTask;

cat-home/src/main/java/com/dianping/cat/report/task/alert/AlarmRule.java → cat-home/src/main/java/com/dianping/cat/report/alert/AlarmRule.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.util.ArrayList;
 import java.util.List;

cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertInfo.java → cat-home/src/main/java/com/dianping/cat/report/alert/AlertInfo.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.util.ArrayList;
 import java.util.List;

cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertLevel.java → cat-home/src/main/java/com/dianping/cat/report/alert/AlertLevel.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 public class AlertLevel {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertResultEntity.java → cat-home/src/main/java/com/dianping/cat/report/alert/AlertResultEntity.java

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

cat-home/src/main/java/com/dianping/cat/report/task/alert/AlertType.java → cat-home/src/main/java/com/dianping/cat/report/alert/AlertType.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 public enum AlertType {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/BaseAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/BaseAlert.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.util.Date;
 import java.util.List;
@@ -20,8 +20,8 @@ import com.dianping.cat.home.rule.entity.Condition;
 import com.dianping.cat.home.rule.entity.Config;
 import com.dianping.cat.message.Event;
 import com.dianping.cat.message.Transaction;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
-import com.dianping.cat.report.task.alert.sender.AlertManager;
+import com.dianping.cat.report.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.sender.AlertManager;
 import com.dianping.cat.system.config.BaseRuleConfigManager;
 
 public abstract class BaseAlert implements Task, LogEnabled {

cat-home/src/main/java/com/dianping/cat/report/task/alert/DataChecker.java → cat-home/src/main/java/com/dianping/cat/report/alert/DataChecker.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.util.List;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/DefaultDataChecker.java → cat-home/src/main/java/com/dianping/cat/report/alert/DefaultDataChecker.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.util.ArrayList;
 import java.util.List;

cat-home/src/main/java/com/dianping/cat/report/task/alert/MetricReportGroup.java → cat-home/src/main/java/com/dianping/cat/report/alert/MetricReportGroup.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.util.Map;
 import java.util.Map.Entry;

cat-home/src/main/java/com/dianping/cat/report/task/alert/MetricType.java → cat-home/src/main/java/com/dianping/cat/report/alert/MetricType.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 public enum MetricType {
 	COUNT("COUNT"), AVG("AVG"), SUM("SUM");

cat-home/src/main/java/com/dianping/cat/report/task/alert/RemoteMetricReportService.java → cat-home/src/main/java/com/dianping/cat/report/alert/RemoteMetricReportService.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,7 +32,7 @@ import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.page.model.metric.MetricReportMerger;
 import com.dianping.cat.report.page.model.spi.internal.ModelServiceWithCalSupport;
-import com.dianping.cat.report.task.alert.MetricReportGroup.State;
+import com.dianping.cat.report.alert.MetricReportGroup.State;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/RuleFTLDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/RuleFTLDecorator.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.io.StringWriter;
 import java.util.HashMap;

cat-home/src/main/java/com/dianping/cat/report/task/alert/RuleType.java → cat-home/src/main/java/com/dianping/cat/report/alert/RuleType.java

-package com.dianping.cat.report.task.alert;
+package com.dianping.cat.report.alert;
 
 import java.io.File;
 import java.io.FileOutputStream;

cat-home/src/main/java/com/dianping/cat/report/task/alert/app/AppAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/app/AppAlert.java

-package com.dianping.cat.report.task.alert.app;
+package com.dianping.cat.report.alert.app;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -25,11 +25,11 @@ import com.dianping.cat.home.rule.entity.Rule;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.service.app.AppDataService;
 import com.dianping.cat.report.service.app.CommandQueryEntity;
-import com.dianping.cat.report.task.alert.AlertResultEntity;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.DataChecker;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
-import com.dianping.cat.report.task.alert.sender.AlertManager;
+import com.dianping.cat.report.alert.AlertResultEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.DataChecker;
+import com.dianping.cat.report.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.sender.AlertManager;
 import com.dianping.cat.system.config.AppRuleConfigManager;
 
 public class AppAlert implements Task {

cat-home/src/main/java/com/dianping/cat/report/task/alert/business/BusinessAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/business/BusinessAlert.java

-package com.dianping.cat.report.task.alert.business;
+package com.dianping.cat.report.alert.business;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,13 +18,13 @@ import com.dianping.cat.home.rule.entity.Condition;
 import com.dianping.cat.home.rule.entity.Config;
 import com.dianping.cat.message.Event;
 import com.dianping.cat.report.service.BaselineService;
-import com.dianping.cat.report.task.alert.AlarmRule;
-import com.dianping.cat.report.task.alert.AlertResultEntity;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.BaseAlert;
-import com.dianping.cat.report.task.alert.MetricReportGroup;
-import com.dianping.cat.report.task.alert.MetricType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlarmRule;
+import com.dianping.cat.report.alert.AlertResultEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.BaseAlert;
+import com.dianping.cat.report.alert.MetricReportGroup;
+import com.dianping.cat.report.alert.MetricType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 import com.dianping.cat.system.config.BaseRuleConfigManager;
 import com.dianping.cat.system.config.BusinessRuleConfigManager;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/database/DatabaseAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/database/DatabaseAlert.java

-package com.dianping.cat.report.task.alert.database;
+package com.dianping.cat.report.alert.database;
 
 import java.util.Map;
 
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.BaseAlert;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.BaseAlert;
 import com.dianping.cat.system.config.BaseRuleConfigManager;
 import com.dianping.cat.system.config.DatabaseRuleConfigManager;
 

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

-package com.dianping.cat.report.task.alert.exception;
+package com.dianping.cat.report.alert.exception;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -13,7 +13,7 @@ import com.dianping.cat.config.aggregation.AggregationConfigManager;
 import com.dianping.cat.configuration.aggreation.model.entity.AggregationRule;
 import com.dianping.cat.home.exception.entity.ExceptionLimit;
 import com.dianping.cat.report.page.dependency.TopMetric.Item;
-import com.dianping.cat.report.task.alert.AlertLevel;
+import com.dianping.cat.report.alert.AlertLevel;
 import com.dianping.cat.system.config.ExceptionRuleConfigManager;
 
 public class AlertExceptionBuilder {

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

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

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

-package com.dianping.cat.report.task.alert.exception;
+package com.dianping.cat.report.alert.exception;
 
 import com.dianping.cat.home.alert.report.entity.AlertReport;
 import com.dianping.cat.home.alert.report.entity.Domain;

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

-package com.dianping.cat.report.task.alert.exception;
+package com.dianping.cat.report.alert.exception;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,10 +20,10 @@ import com.dianping.cat.report.page.dependency.TopExceptionExclude;
 import com.dianping.cat.report.page.dependency.TopMetric;
 import com.dianping.cat.report.page.dependency.TopMetric.Item;
 import com.dianping.cat.report.page.model.spi.ModelService;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder.AlertException;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
-import com.dianping.cat.report.task.alert.sender.AlertManager;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.exception.AlertExceptionBuilder.AlertException;
+import com.dianping.cat.report.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.sender.AlertManager;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
 import com.dianping.cat.system.config.ExceptionRuleConfigManager;

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

-package com.dianping.cat.report.task.alert.exception;
+package com.dianping.cat.report.alert.exception;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.page.dependency.TopMetric;
 import com.dianping.cat.report.page.dependency.TopMetric.Item;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.exception.AlertExceptionBuilder.AlertException;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.exception.AlertExceptionBuilder.AlertException;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 public class FrontEndExceptionAlert extends ExceptionAlert {
 

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

-package com.dianping.cat.report.task.alert.exception;
+package com.dianping.cat.report.alert.exception;
 
 import org.unidal.lookup.annotation.Inject;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/heartbeat/HeartbeatAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/heartbeat/HeartbeatAlert.java

-package com.dianping.cat.report.task.alert.heartbeat;
+package com.dianping.cat.report.alert.heartbeat;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -29,10 +29,10 @@ import com.dianping.cat.home.rule.entity.Condition;
 import com.dianping.cat.home.rule.entity.Config;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.page.model.spi.ModelService;
-import com.dianping.cat.report.task.alert.AlertResultEntity;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.BaseAlert;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertResultEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.BaseAlert;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;
 import com.dianping.cat.system.config.BaseRuleConfigManager;

cat-home/src/main/java/com/dianping/cat/report/task/alert/network/NetworkAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/network/NetworkAlert.java

-package com.dianping.cat.report.task.alert.network;
+package com.dianping.cat.report.alert.network;
 
 import java.util.Map;
 
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.BaseAlert;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.BaseAlert;
 import com.dianping.cat.system.config.BaseRuleConfigManager;
 import com.dianping.cat.system.config.NetworkRuleConfigManager;
 

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

-package com.dianping.cat.report.task.alert.sender;
+package com.dianping.cat.report.alert.sender;
 
 public enum AlertChannel {
 

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

-package com.dianping.cat.report.task.alert.sender;
+package com.dianping.cat.report.alert.sender;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class AlertEntity {
 

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

-package com.dianping.cat.report.task.alert.sender;
+package com.dianping.cat.report.alert.sender;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -23,12 +23,12 @@ import org.unidal.tuple.Pair;
 import com.dianping.cat.Cat;
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.message.Event;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.decorator.DecoratorManager;
-import com.dianping.cat.report.task.alert.sender.receiver.ContactorManager;
-import com.dianping.cat.report.task.alert.sender.sender.SenderManager;
-import com.dianping.cat.report.task.alert.sender.spliter.SpliterManager;
-import com.dianping.cat.report.task.alert.service.AlertEntityService;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.decorator.DecoratorManager;
+import com.dianping.cat.report.alert.sender.receiver.ContactorManager;
+import com.dianping.cat.report.alert.sender.sender.SenderManager;
+import com.dianping.cat.report.alert.sender.spliter.SpliterManager;
+import com.dianping.cat.report.alert.service.AlertEntityService;
 import com.dianping.cat.system.config.AlertPolicyManager;
 
 public class AlertManager implements Initializable {

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

-package com.dianping.cat.report.task.alert.sender;
+package com.dianping.cat.report.alert.sender;
 
 import java.util.List;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/AppDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/AppDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.io.StringWriter;
 import java.util.HashMap;
@@ -8,8 +8,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/BusinessDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/BusinessDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -6,9 +6,9 @@ import java.util.Date;
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.consumer.productline.ProductLineConfigManager;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
-import com.dianping.cat.report.task.alert.summary.AlertSummaryExecutor;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.summary.AlertSummaryExecutor;
 
 public class BusinessDecorator extends ProjectDecorator {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/DatabaseDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/DatabaseDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 public class DatabaseDecorator extends Decorator {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/Decorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/Decorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 public abstract class Decorator {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/DecoratorManager.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/DecoratorManager.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,7 +8,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationExce
 import org.unidal.lookup.ContainerHolder;
 import org.unidal.tuple.Pair;
 
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 public class DecoratorManager extends ContainerHolder implements Initializable {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ExceptionDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/ExceptionDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.io.StringWriter;
 import java.text.DateFormat;
@@ -11,9 +11,9 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationExce
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
-import com.dianping.cat.report.task.alert.summary.AlertSummaryExecutor;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.summary.AlertSummaryExecutor;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/FrontEndExceptionDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/FrontEndExceptionDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.io.StringWriter;
 import java.text.DateFormat;
@@ -11,8 +11,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationExce
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.Constants;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/HeartbeatDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/HeartbeatDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 public class HeartbeatDecorator extends Decorator {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/NetworkDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/NetworkDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 public class NetworkDecorator extends Decorator {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ProjectDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/ProjectDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import org.unidal.lookup.annotation.Inject;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/SystemDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/SystemDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 public class SystemDecorator extends Decorator {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/ThirdpartyDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/ThirdpartyDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.io.StringWriter;
 import java.text.DateFormat;
@@ -10,8 +10,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/TransactionDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/TransactionDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.io.StringWriter;
 import java.text.DateFormat;
@@ -10,8 +10,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/decorator/WebDecorator.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/decorator/WebDecorator.java

-package com.dianping.cat.report.task.alert.sender.decorator;
+package com.dianping.cat.report.alert.sender.decorator;
 
 import java.io.StringWriter;
 import java.util.HashMap;
@@ -8,8 +8,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/AppContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/AppContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.util.List;
 import java.util.Map;
@@ -8,7 +8,7 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.config.app.AppConfigManager;
 import com.dianping.cat.configuration.app.entity.Command;
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class AppContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/BusinessContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/BusinessContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class BusinessContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/Contactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/Contactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.util.List;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ContactorManager.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ContactorManager.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,7 +8,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.unidal.lookup.ContainerHolder;
 
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertChannel;
 
 public class ContactorManager extends ContainerHolder implements Initializable {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/DatabaseContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/DatabaseContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class DatabaseContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/DefaultContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/DefaultContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.util.ArrayList;
 import java.util.List;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ExceptionContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ExceptionContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class ExceptionContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/FrontEndExceptionContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/FrontEndExceptionContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -10,7 +10,7 @@ import org.unidal.lookup.annotation.Inject;
 import com.dianping.cat.config.aggregation.AggregationConfigManager;
 import com.dianping.cat.configuration.aggreation.model.entity.AggregationRule;
 import com.dianping.cat.home.alert.config.entity.Receiver;
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 import com.dianping.cat.system.config.AlertConfigManager;
 
 public class FrontEndExceptionContactor extends DefaultContactor implements Contactor {

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/HeartbeatContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/HeartbeatContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class HeartbeatContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/NetworkContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/NetworkContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class NetworkContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ProjectContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ProjectContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.util.ArrayList;
 import java.util.List;

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/SystemContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/SystemContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.util.List;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class SystemContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/ThirdpartyContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/ThirdpartyContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class ThirdpartyContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/TransactionContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/TransactionContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class TransactionContactor extends ProjectContactor {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/receiver/WebContactor.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/receiver/WebContactor.java

-package com.dianping.cat.report.task.alert.sender.receiver;
+package com.dianping.cat.report.alert.sender.receiver;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.config.url.UrlPatternConfigManager;
 import com.dianping.cat.configuration.url.pattern.entity.PatternItem;
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class WebContactor extends ProjectContactor {
 

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

-package com.dianping.cat.report.task.alert.sender.sender;
+package com.dianping.cat.report.alert.sender.sender;
 
 import java.io.IOException;
 import java.io.InputStream;

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

-package com.dianping.cat.report.task.alert.sender.sender;
+package com.dianping.cat.report.alert.sender.sender;
 
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
@@ -6,8 +6,8 @@ import java.util.Date;
 import java.util.List;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
-import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
 
 public class MailSender extends AbstractSender {
 

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

-package com.dianping.cat.report.task.alert.sender.sender;
+package com.dianping.cat.report.alert.sender.sender;
 
-import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
 
 public interface Sender {
 

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

-package com.dianping.cat.report.task.alert.sender.sender;
+package com.dianping.cat.report.alert.sender.sender;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,8 +9,8 @@ import org.unidal.lookup.ContainerHolder;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.message.Event;
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
-import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
 
 public class SenderManager extends ContainerHolder implements Initializable {
 

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

-package com.dianping.cat.report.task.alert.sender.sender;
+package com.dianping.cat.report.alert.sender.sender;
 
 import java.net.URLEncoder;
 import java.util.List;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
-import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
 
 public class SmsSender extends AbstractSender {
 

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

-package com.dianping.cat.report.task.alert.sender.sender;
+package com.dianping.cat.report.alert.sender.sender;
 
 import java.net.URLEncoder;
 import java.util.List;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
-import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
 
 public class WeixinSender extends AbstractSender {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/MailSpliter.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/spliter/MailSpliter.java

-package com.dianping.cat.report.task.alert.sender.spliter;
+package com.dianping.cat.report.alert.sender.spliter;
 
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertChannel;
 
 public class MailSpliter implements Spliter {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/SmsSpliter.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/spliter/SmsSpliter.java

-package com.dianping.cat.report.task.alert.sender.spliter;
+package com.dianping.cat.report.alert.sender.spliter;
 
 import java.util.regex.Pattern;
 
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertChannel;
 
 public class SmsSpliter implements Spliter {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/Spliter.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/spliter/Spliter.java

-package com.dianping.cat.report.task.alert.sender.spliter;
+package com.dianping.cat.report.alert.sender.spliter;
 
 public interface Spliter {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/SpliterManager.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/spliter/SpliterManager.java

-package com.dianping.cat.report.task.alert.sender.spliter;
+package com.dianping.cat.report.alert.sender.spliter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,7 +7,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.unidal.lookup.ContainerHolder;
 
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertChannel;
 
 public class SpliterManager extends ContainerHolder implements Initializable {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/spliter/WeixinSpliter.java → cat-home/src/main/java/com/dianping/cat/report/alert/sender/spliter/WeixinSpliter.java

-package com.dianping.cat.report.task.alert.sender.spliter;
+package com.dianping.cat.report.alert.sender.spliter;
 
 import java.util.regex.Pattern;
 
-import com.dianping.cat.report.task.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertChannel;
 
 public class WeixinSpliter implements Spliter {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/service/AlertEntityService.java → cat-home/src/main/java/com/dianping/cat/report/alert/service/AlertEntityService.java

-package com.dianping.cat.report.task.alert.service;
+package com.dianping.cat.report.alert.service;
 
 import org.unidal.dal.jdbc.DalException;
 import org.unidal.lookup.annotation.Inject;
@@ -6,9 +6,9 @@ import org.unidal.lookup.annotation.Inject;
 import com.dianping.cat.Cat;
 import com.dianping.cat.home.dal.report.Alert;
 import com.dianping.cat.home.dal.report.AlertDao;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
-import com.dianping.cat.report.task.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
 
 public class AlertEntityService {
 

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

-package com.dianping.cat.report.task.alert.summary;
+package com.dianping.cat.report.alert.summary;
 
 import java.util.ArrayList;
 import java.util.Date;

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

-package com.dianping.cat.report.task.alert.summary;
+package com.dianping.cat.report.alert.summary;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -13,9 +13,9 @@ import org.unidal.lookup.util.StringUtils;
 import com.dianping.cat.Cat;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.message.Transaction;
-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.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.sender.sender.SenderManager;
 
 public class AlertSummaryExecutor {
 

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

-package com.dianping.cat.report.task.alert.summary;
+package com.dianping.cat.report.alert.summary;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,7 +20,7 @@ import com.dianping.cat.home.dal.report.AlertEntity;
 import com.dianping.cat.home.dependency.graph.entity.TopologyEdge;
 import com.dianping.cat.home.dependency.graph.entity.TopologyGraph;
 import com.dianping.cat.report.page.dependency.graph.TopologyGraphManager;
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class AlertSummaryGenerator {
 

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

-package com.dianping.cat.report.task.alert.summary;
+package com.dianping.cat.report.alert.summary;
 
 import org.unidal.dal.jdbc.DalException;
 import org.unidal.lookup.annotation.Inject;

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

-package com.dianping.cat.report.task.alert.summary;
+package com.dianping.cat.report.alert.summary;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -13,7 +13,7 @@ import com.dianping.cat.home.alert.summary.entity.Alert;
 import com.dianping.cat.home.alert.summary.entity.AlertSummary;
 import com.dianping.cat.home.alert.summary.entity.Category;
 import com.dianping.cat.home.alert.summary.transform.BaseVisitor;
-import com.dianping.cat.report.task.alert.AlertType;
+import com.dianping.cat.report.alert.AlertType;
 
 public class AlertSummaryVisitor extends BaseVisitor {
 

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

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

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

-package com.dianping.cat.report.task.alert.summary;
+package com.dianping.cat.report.alert.summary;
 
 import java.util.Calendar;
 import java.util.Date;

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

-package com.dianping.cat.report.task.alert.summary;
+package com.dianping.cat.report.alert.summary;
 
 import java.io.StringWriter;
 import java.util.Date;

cat-home/src/main/java/com/dianping/cat/report/task/alert/system/SystemAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/system/SystemAlert.java

-package com.dianping.cat.report.task.alert.system;
+package com.dianping.cat.report.alert.system;
 
 import java.util.Map;
 
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.BaseAlert;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.BaseAlert;
 import com.dianping.cat.system.config.BaseRuleConfigManager;
 import com.dianping.cat.system.config.SystemRuleConfigManager;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/HttpConnector.java → cat-home/src/main/java/com/dianping/cat/report/alert/thirdParty/HttpConnector.java

-package com.dianping.cat.report.task.alert.thirdParty;
+package com.dianping.cat.report.alert.thirdParty;
 
 import java.io.BufferedReader;
 import java.io.IOException;

cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/thirdParty/ThirdPartyAlert.java

-package com.dianping.cat.report.task.alert.thirdParty;
+package com.dianping.cat.report.alert.thirdParty;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -16,10 +16,10 @@ import org.unidal.lookup.annotation.Inject;
 import com.dianping.cat.Cat;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.message.Transaction;
-import com.dianping.cat.report.task.alert.AlertLevel;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
-import com.dianping.cat.report.task.alert.sender.AlertManager;
+import com.dianping.cat.report.alert.AlertLevel;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.sender.AlertManager;
 
 public class ThirdPartyAlert implements Task {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlertBuilder.java → cat-home/src/main/java/com/dianping/cat/report/alert/thirdParty/ThirdPartyAlertBuilder.java

-package com.dianping.cat.report.task.alert.thirdParty;
+package com.dianping.cat.report.alert.thirdParty;
 
 import java.util.List;
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/thirdParty/ThirdPartyAlertEntity.java → cat-home/src/main/java/com/dianping/cat/report/alert/thirdParty/ThirdPartyAlertEntity.java

-package com.dianping.cat.report.task.alert.thirdParty;
+package com.dianping.cat.report.alert.thirdParty;
 
 public class ThirdPartyAlertEntity {
 

cat-home/src/main/java/com/dianping/cat/report/task/alert/transaction/TransactionAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/transaction/TransactionAlert.java

-package com.dianping.cat.report.task.alert.transaction;
+package com.dianping.cat.report.alert.transaction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,10 +26,10 @@ import com.dianping.cat.home.rule.entity.Rule;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.page.transaction.TransactionMergeHelper;
-import com.dianping.cat.report.task.alert.AlertResultEntity;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.BaseAlert;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertResultEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.BaseAlert;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.service.ModelResponse;

cat-home/src/main/java/com/dianping/cat/report/task/alert/web/WebAlert.java → cat-home/src/main/java/com/dianping/cat/report/alert/web/WebAlert.java

-package com.dianping.cat.report.task.alert.web;
+package com.dianping.cat.report.alert.web;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,10 +28,10 @@ import com.dianping.cat.home.rule.entity.Config;
 import com.dianping.cat.home.rule.entity.Rule;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.report.service.app.AppDataService;
-import com.dianping.cat.report.task.alert.AlertResultEntity;
-import com.dianping.cat.report.task.alert.AlertType;
-import com.dianping.cat.report.task.alert.BaseAlert;
-import com.dianping.cat.report.task.alert.sender.AlertEntity;
+import com.dianping.cat.report.alert.AlertResultEntity;
+import com.dianping.cat.report.alert.AlertType;
+import com.dianping.cat.report.alert.BaseAlert;
+import com.dianping.cat.report.alert.sender.AlertEntity;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.system.config.BaseRuleConfigManager;

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

@@ -18,7 +18,7 @@ import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.service.BaselineService;
-import com.dianping.cat.report.task.alert.AlertInfo;
+import com.dianping.cat.report.alert.AlertInfo;
 
 public abstract class AbstractGraphCreator implements LogEnabled {
 	@Inject

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

@@ -8,7 +8,7 @@ import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.consumer.metric.model.entity.Segment;
 import com.dianping.cat.consumer.metric.model.transform.BaseVisitor;
 import com.dianping.cat.report.graph.metric.MetricDataFetcher;
-import com.dianping.cat.report.task.alert.MetricType;
+import com.dianping.cat.report.alert.MetricType;
 
 public class MetricDataFetcherImpl implements MetricDataFetcher {
 

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

@@ -28,9 +28,9 @@ import com.dianping.cat.home.dal.report.Alert;
 import com.dianping.cat.home.dal.report.AlertDao;
 import com.dianping.cat.home.dal.report.AlertEntity;
 import com.dianping.cat.report.ReportPage;
-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.alert.sender.AlertChannel;
+import com.dianping.cat.report.alert.sender.AlertMessageEntity;
+import com.dianping.cat.report.alert.sender.sender.SenderManager;
 
 public class Handler implements PageHandler<Context> {
 	@Inject

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

@@ -11,8 +11,8 @@ 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.task.alert.AlertInfo.AlertMetric;
-import com.dianping.cat.report.task.alert.MetricType;
+import com.dianping.cat.report.alert.AlertInfo.AlertMetric;
+import com.dianping.cat.report.alert.MetricType;
 
 public class GraphCreator extends AbstractGraphCreator {
 

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

@@ -23,8 +23,8 @@ 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.task.alert.AlertInfo.AlertMetric;
-import com.dianping.cat.report.task.alert.MetricType;
+import com.dianping.cat.report.alert.AlertInfo.AlertMetric;
+import com.dianping.cat.report.alert.MetricType;
 import com.dianping.cat.service.ProjectService;
 
 public class GraphCreator extends AbstractGraphCreator {

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

@@ -20,7 +20,7 @@ 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.task.alert.MetricType;
+import com.dianping.cat.report.alert.MetricType;
 
 public class Handler implements PageHandler<Context> {
 

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

@@ -14,8 +14,8 @@ 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.task.alert.AlertInfo.AlertMetric;
-import com.dianping.cat.report.task.alert.MetricType;
+import com.dianping.cat.report.alert.AlertInfo.AlertMetric;
+import com.dianping.cat.report.alert.MetricType;
 
 public class GraphCreator extends AbstractGraphCreator {
 

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

@@ -14,7 +14,7 @@ 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.home.network.entity.Switch;
-import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;
+import com.dianping.cat.report.alert.AlertInfo.AlertMetric;
 
 public class NetGraphBuilder {
 

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

@@ -30,9 +30,9 @@ 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.service.ReportServiceManager;
-import com.dianping.cat.report.task.alert.AlertInfo;
-import com.dianping.cat.report.task.alert.AlertInfo.AlertMetric;
-import com.dianping.cat.report.task.alert.RemoteMetricReportService;
+import com.dianping.cat.report.alert.AlertInfo;
+import com.dianping.cat.report.alert.AlertInfo.AlertMetric;
+import com.dianping.cat.report.alert.RemoteMetricReportService;
 import com.dianping.cat.service.ModelPeriod;
 import com.dianping.cat.service.ModelRequest;
 import com.dianping.cat.system.config.NetGraphConfigManager;

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

@@ -45,7 +45,7 @@ import com.dianping.cat.home.utilization.entity.UtilizationReport;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.PayloadNormalizer;
 import com.dianping.cat.report.service.ReportServiceManager;
-import com.dianping.cat.report.task.alert.summary.AlertSummaryExecutor;
+import com.dianping.cat.report.alert.summary.AlertSummaryExecutor;
 import com.dianping.cat.report.task.heavy.HeavyReportMerger.ServiceComparator;
 import com.dianping.cat.report.task.heavy.HeavyReportMerger.UrlComparator;
 import com.dianping.cat.report.task.jar.JarReportBuilder;

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

@@ -3,7 +3,7 @@ package com.dianping.cat.report.service;
 import java.util.Date;
 
 import com.dianping.cat.home.dal.report.Baseline;
-import com.dianping.cat.report.task.alert.MetricType;
+import com.dianping.cat.report.alert.MetricType;
 
 public interface BaselineService {