modify the package

cat-broker/src/main/java/com/dianping/cat/broker/api/page/MonitorManager.java

@@ -18,12 +18,12 @@ import com.dianping.cat.Cat;
 import com.dianping.cat.CatConstants;
 import com.dianping.cat.Constants;
 import com.dianping.cat.config.url.UrlPatternConfigManager;
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.IpService.IpInfo;
 import com.dianping.cat.message.Event;
 import com.dianping.cat.message.Metric;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.message.internal.DefaultMetric;
+import com.dianping.cat.service.IpService;
+import com.dianping.cat.service.IpService.IpInfo;
 
 import org.unidal.lookup.util.StringUtils;
 

cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java

@@ -23,9 +23,9 @@ import com.dianping.cat.broker.api.app.proto.AppDataProto;
 import com.dianping.cat.broker.api.app.proto.ProtoData;
 import com.dianping.cat.broker.api.page.RequestUtils;
 import com.dianping.cat.config.app.AppConfigManager;
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.IpService.IpInfo;
 import com.dianping.cat.message.Event;
+import com.dianping.cat.service.IpService;
+import com.dianping.cat.service.IpService.IpInfo;
 
 public class Handler implements PageHandler<Context>, LogEnabled {
 

cat-broker/src/main/java/com/dianping/cat/broker/api/page/connection/Handler.java

@@ -26,9 +26,9 @@ import com.dianping.cat.broker.api.page.batch.Context;
 import com.dianping.cat.broker.api.page.batch.Payload;
 import com.dianping.cat.broker.api.page.batch.UrlParser;
 import com.dianping.cat.config.app.AppConfigManager;
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.IpService.IpInfo;
 import com.dianping.cat.message.Event;
+import com.dianping.cat.service.IpService;
+import com.dianping.cat.service.IpService.IpInfo;
 
 public class Handler implements PageHandler<Context>, LogEnabled {
 	@Inject

cat-broker/src/main/java/com/dianping/cat/broker/api/page/speed/Handler.java

@@ -24,9 +24,9 @@ import com.dianping.cat.broker.api.app.proto.ProtoData;
 import com.dianping.cat.broker.api.page.RequestUtils;
 import com.dianping.cat.config.app.AppConfigManager;
 import com.dianping.cat.config.app.AppSpeedConfigManager;
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.IpService.IpInfo;
 import com.dianping.cat.message.Event;
+import com.dianping.cat.service.IpService;
+import com.dianping.cat.service.IpService.IpInfo;
 
 import org.unidal.helper.Splitters;
 import org.unidal.lookup.util.StringUtils;

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

@@ -22,7 +22,7 @@ import com.dianping.cat.config.app.AppCommandDataTableProvider;
 import com.dianping.cat.config.app.AppConnectionTableProvider;
 import com.dianping.cat.config.app.AppSpeedTableProvider;
 import com.dianping.cat.config.url.UrlPatternConfigManager;
-import com.dianping.cat.dal.IpService;
+import com.dianping.cat.service.IpService;
 
 public class ComponentsConfigurator extends AbstractResourceConfigurator {
 	public static void main(String[] args) {

cat-broker/src/main/resources/META-INF/plexus/components.xml

@@ -12,7 +12,7 @@
 					<role>com.dianping.cat.config.url.UrlPatternConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.dal.IpService</role>
+					<role>com.dianping.cat.service.IpService</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -154,7 +154,7 @@
 			<implementation>com.dianping.cat.broker.api.page.MonitorManager</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.dal.IpService</role>
+					<role>com.dianping.cat.service.IpService</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.config.url.UrlPatternConfigManager</role>
@@ -162,8 +162,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.dal.IpService</role>
-			<implementation>com.dianping.cat.dal.IpService</implementation>
+			<role>com.dianping.cat.service.IpService</role>
+			<implementation>com.dianping.cat.service.IpService</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.config.url.UrlPatternConfigManager</role>
@@ -201,7 +201,7 @@
 					<role>com.dianping.cat.broker.api.app.AppConsumer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.dal.IpService</role>
+					<role>com.dianping.cat.service.IpService</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.config.app.AppConfigManager</role>
@@ -299,7 +299,7 @@
 					<role>com.dianping.cat.broker.api.app.AppConsumer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.dal.IpService</role>
+					<role>com.dianping.cat.service.IpService</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.config.app.AppConfigManager</role>

cat-broker/src/test/java/com/dianping/cat/broker/IpServiceTest.java

@@ -3,8 +3,8 @@ package com.dianping.cat.broker;
 import org.junit.Test;
 import org.unidal.lookup.ComponentTestCase;
 
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.IpService.IpInfo;
+import com.dianping.cat.service.IpService;
+import com.dianping.cat.service.IpService.IpInfo;
 
 public class IpServiceTest extends ComponentTestCase {
 	@Test

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

@@ -49,7 +49,6 @@ import com.dianping.cat.core.config.ConfigDao;
 import com.dianping.cat.core.dal.HourlyReportContentDao;
 import com.dianping.cat.core.dal.HourlyReportDao;
 import com.dianping.cat.core.dal.ProjectDao;
-import com.dianping.cat.dal.ProjectService;
 import com.dianping.cat.hadoop.hdfs.HdfsUploader;
 import com.dianping.cat.message.PathBuilder;
 import com.dianping.cat.message.storage.MessageBucketManager;
@@ -58,6 +57,7 @@ import com.dianping.cat.report.DomainValidator;
 import com.dianping.cat.report.ReportBucketManager;
 import com.dianping.cat.report.ReportDelegate;
 import com.dianping.cat.report.ReportManager;
+import com.dianping.cat.service.ProjectService;
 import com.dianping.cat.statistic.ServerStatisticManager;
 import com.dianping.cat.task.TaskManager;
 

cat-consumer/src/main/resources/META-INF/plexus/components.xml

@@ -338,8 +338,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.dal.ProjectService</role>
-			<implementation>com.dianping.cat.dal.ProjectService</implementation>
+			<role>com.dianping.cat.service.ProjectService</role>
+			<implementation>com.dianping.cat.service.ProjectService</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.dal.ProjectDao</role>

cat-consumer/src/test/java/com/dianping/cat/consumer/dependency/Configurator.java

@@ -13,9 +13,9 @@ import org.unidal.lookup.configuration.Component;
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.MockReportManager;
 import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
-import com.dianping.cat.dal.HostinfoService;
 import com.dianping.cat.report.ReportDelegate;
 import com.dianping.cat.report.ReportManager;
+import com.dianping.cat.service.HostinfoService;
 
 public class Configurator extends AbstractResourceConfigurator {
 

cat-core/src/main/java/com/dianping/cat/analysis/TcpSocketReceiver.java

@@ -59,6 +59,18 @@ public final class TcpSocketReceiver implements LogEnabled {
 
 	private volatile long m_processCount;
 
+	public synchronized void destory() {
+		try {
+			m_logger.info("start shutdown socket, port " + m_port);
+			m_future.channel().closeFuture();
+			m_bossGroup.shutdownGracefully();
+			m_workerGroup.shutdownGracefully();
+			m_logger.info("shutdown socket success");
+		} catch (Exception e) {
+			m_logger.warn(e.getMessage(), e);
+		}
+	}
+
 	@Override
 	public void enableLogging(Logger logger) {
 		m_logger = logger;
@@ -81,18 +93,6 @@ public final class TcpSocketReceiver implements LogEnabled {
 		}
 	}
 
-	public synchronized void destory() {
-		try {
-			m_logger.info("start shutdown socket, port " + m_port);
-			m_future.channel().closeFuture();
-			m_bossGroup.shutdownGracefully();
-			m_workerGroup.shutdownGracefully();
-			m_logger.info("shutdown socket success");
-		} catch (Exception e) {
-			m_logger.warn(e.getMessage(), e);
-		}
-	}
-
 	public synchronized void startServer(int port) throws InterruptedException {
 		boolean linux = getOSMatches("Linux") || getOSMatches("LINUX");
 		int threads = 24;

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

@@ -31,13 +31,13 @@ import com.dianping.cat.config.url.UrlPatternHandler;
 import com.dianping.cat.core.config.ConfigDao;
 import com.dianping.cat.core.dal.HostinfoDao;
 import com.dianping.cat.core.dal.TaskDao;
-import com.dianping.cat.dal.HostinfoService;
-import com.dianping.cat.dal.IpService;
 import com.dianping.cat.message.DefaultPathBuilder;
 import com.dianping.cat.message.PathBuilder;
 import com.dianping.cat.message.spi.MessageCodec;
 import com.dianping.cat.message.spi.codec.PlainTextMessageCodec;
 import com.dianping.cat.report.DomainValidator;
+import com.dianping.cat.service.HostinfoService;
+import com.dianping.cat.service.IpService;
 import com.dianping.cat.statistic.ServerStatisticManager;
 import com.dianping.cat.task.TaskManager;
 

cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportModel.java

@@ -16,10 +16,10 @@ import org.unidal.web.mvc.Page;
 import org.unidal.web.mvc.ViewModel;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.dal.HostinfoService;
-import com.dianping.cat.dal.ProjectService;
-import com.dianping.cat.dal.ProjectService.Department;
 import com.dianping.cat.helper.JsonBuilder;
+import com.dianping.cat.service.HostinfoService;
+import com.dianping.cat.service.ProjectService;
+import com.dianping.cat.service.ProjectService.Department;
 
 public abstract class AbstractReportModel<A extends Action, P extends Page, M extends ActionContext<?>> extends
       ViewModel<P, A, M> {

cat-core/src/main/java/com/dianping/cat/mvc/AbstractReportPayload.java

@@ -13,7 +13,7 @@ import org.unidal.web.mvc.payload.annotation.FieldMeta;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelPeriod;
 
 public abstract class AbstractReportPayload<A extends Action, P extends Page> implements ActionPayload<P, A> {
 

cat-core/src/main/java/com/dianping/cat/mvc/ApiPayload.java

@@ -36,7 +36,7 @@ public class ApiPayload {
 
 	@FieldMeta("province")
 	private String m_province;
-	
+
 	@FieldMeta("queryType")
 	private String m_queryType;
 
@@ -48,17 +48,17 @@ public class ApiPayload {
 	}
 
 	public String getChannel() {
-   	return m_channel;
-   }
-	
+		return m_channel;
+	}
+
 	public String getCity() {
-   	return m_city;
-   }
-	
+		return m_city;
+	}
+
 	public String getDatabase() {
 		return m_database;
 	}
-	
+
 	public String getIpAddress() {
 		return m_ipAddress;
 	}
@@ -80,8 +80,8 @@ public class ApiPayload {
 	}
 
 	public String getQueryType() {
-   	return m_queryType;
-   }
+		return m_queryType;
+	}
 
 	public String getThreadId() {
 		return m_threadId;
@@ -90,7 +90,7 @@ public class ApiPayload {
 	public String getType() {
 		return m_type;
 	}
-	
+
 	public boolean isWaterfall() {
 		return m_waterfall;
 	}
@@ -100,12 +100,12 @@ public class ApiPayload {
 	}
 
 	public void setChannel(String channel) {
-   	m_channel = channel;
-   }
+		m_channel = channel;
+	}
 
 	public void setCity(String city) {
-   	m_city = city;
-   }
+		m_city = city;
+	}
 
 	public void setDatabase(String database) {
 		m_database = database;
@@ -126,14 +126,14 @@ public class ApiPayload {
 	public void setName(String name) {
 		m_name = name;
 	}
-	
+
 	public void setProvince(String province) {
 		m_province = province;
 	}
 
 	public void setQueryType(String queryType) {
-   	m_queryType = queryType;
-   }
+		m_queryType = queryType;
+	}
 
 	public void setThreadId(String threadId) {
 		m_threadId = threadId;

cat-core/src/main/java/com/dianping/cat/report/DefaultReportManager.java

@@ -25,7 +25,7 @@ import com.dianping.cat.core.dal.HourlyReportContentDao;
 import com.dianping.cat.core.dal.HourlyReportDao;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;
-import com.dianping.cat.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelPeriod;
 
 /**
  * Hourly report manager by domain of one report type(such as Transaction, Event, Problem, Heartbeat etc.) produced in

cat-core/src/main/java/com/dianping/cat/service/AbstractReportService.java → cat-core/src/main/java/com/dianping/cat/report/service/AbstractReportService.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

cat-core/src/main/java/com/dianping/cat/service/BaseCompositeModelService.java → cat-core/src/main/java/com/dianping/cat/report/service/BaseCompositeModelService.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import java.util.ArrayList;
 import java.util.Collections;

cat-core/src/main/java/com/dianping/cat/service/BaseHistoricalModelService.java → cat-core/src/main/java/com/dianping/cat/report/service/BaseHistoricalModelService.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;

cat-core/src/main/java/com/dianping/cat/service/BaseRemoteModelService.java → cat-core/src/main/java/com/dianping/cat/report/service/BaseRemoteModelService.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import java.io.IOException;
 import java.io.InputStream;

cat-core/src/main/java/com/dianping/cat/service/LocalModelService.java → cat-core/src/main/java/com/dianping/cat/report/service/LocalModelService.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -25,8 +25,6 @@ public abstract class LocalModelService<T> implements Initializable {
 
 	private String m_name;
 	
-	public abstract String getReport(ModelRequest request, ModelPeriod period, String domain, ApiPayload payload) throws Exception;
-
 	public LocalModelService(String name) {
 		m_name = name;
 	}
@@ -60,6 +58,8 @@ public abstract class LocalModelService<T> implements Initializable {
 		throw new RuntimeException("Internal error: this should not be reached!");
 	}
 
+	public abstract String getReport(ModelRequest request, ModelPeriod period, String domain, ApiPayload payload) throws Exception;
+
 	@Override
 	public void initialize() throws InitializationException {
 		m_defaultDomain = m_manager.getConsoleDefaultDomain();

cat-core/src/main/java/com/dianping/cat/service/ModelPeriod.java → cat-core/src/main/java/com/dianping/cat/report/service/ModelPeriod.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import com.dianping.cat.Constants;
 

cat-core/src/main/java/com/dianping/cat/service/ModelRequest.java → cat-core/src/main/java/com/dianping/cat/report/service/ModelRequest.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

cat-core/src/main/java/com/dianping/cat/service/ModelResponse.java → cat-core/src/main/java/com/dianping/cat/report/service/ModelResponse.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 
 public class ModelResponse<M> {

cat-core/src/main/java/com/dianping/cat/service/ModelService.java → cat-core/src/main/java/com/dianping/cat/report/service/ModelService.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 
 public interface ModelService<M> {

cat-core/src/main/java/com/dianping/cat/service/ModelServiceWithCalSupport.java → cat-core/src/main/java/com/dianping/cat/report/service/ModelServiceWithCalSupport.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

cat-core/src/main/java/com/dianping/cat/service/ReportService.java → cat-core/src/main/java/com/dianping/cat/report/service/ReportService.java

-package com.dianping.cat.service;
+package com.dianping.cat.report.service;
 
 import java.util.Date;
 import java.util.Set;

cat-core/src/main/java/com/dianping/cat/dal/HostinfoService.java → cat-core/src/main/java/com/dianping/cat/service/HostinfoService.java

-package com.dianping.cat.dal;
+package com.dianping.cat.service;
 
 import java.util.ArrayList;
 import java.util.Date;

cat-core/src/main/java/com/dianping/cat/dal/IpService.java → cat-core/src/main/java/com/dianping/cat/service/IpService.java

-package com.dianping.cat.dal;
+package com.dianping.cat.service;
 
 import java.io.BufferedReader;
 import java.io.IOException;

cat-core/src/main/java/com/dianping/cat/dal/ProjectService.java → cat-core/src/main/java/com/dianping/cat/service/ProjectService.java

-package com.dianping.cat.dal;
+package com.dianping.cat.service;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -95,15 +95,6 @@ public class ProjectService implements Initializable {
 		}
 	}
 
-	public Project findProject(String domain) {
-		Project project = m_domainToProjects.get(domain);
-
-		if (project == null) {
-			project = m_cmdbToProjects.get(domain);
-		}
-		return project;
-	}
-
 	public Map<String, Department> findDepartments(Collection<String> domains) {
 		Map<String, Department> departments = new TreeMap<String, Department>();
 
@@ -131,6 +122,15 @@ public class ProjectService implements Initializable {
 		return departments;
 	}
 
+	public Project findProject(String domain) {
+		Project project = m_domainToProjects.get(domain);
+
+		if (project == null) {
+			project = m_cmdbToProjects.get(domain);
+		}
+		return project;
+	}
+
 	@Override
 	public void initialize() throws InitializationException {
 		if (!m_manager.isLocalMode()) {

cat-core/src/main/resources/META-INF/plexus/components.xml

@@ -16,8 +16,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.dal.HostinfoService</role>
-			<implementation>com.dianping.cat.dal.HostinfoService</implementation>
+			<role>com.dianping.cat.service.HostinfoService</role>
+			<implementation>com.dianping.cat.service.HostinfoService</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.dal.HostinfoDao</role>
@@ -28,8 +28,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.dal.IpService</role>
-			<implementation>com.dianping.cat.dal.IpService</implementation>
+			<role>com.dianping.cat.service.IpService</role>
+			<implementation>com.dianping.cat.service.IpService</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.task.TaskManager</role>

cat-core/src/test/java/com/dianping/cat/service/IpServiceTest.java

@@ -3,8 +3,7 @@ package com.dianping.cat.service;
 import org.junit.Test;
 import org.unidal.lookup.ComponentTestCase;
 
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.IpService.IpInfo;
+import com.dianping.cat.service.IpService.IpInfo;
 
 public class IpServiceTest extends ComponentTestCase {
 	@Test

cat-core/src/test/java/com/dianping/cat/service/ModelPeriodTest.java

@@ -2,6 +2,8 @@ package com.dianping.cat.service;
 
 import org.junit.Test;
 
+import com.dianping.cat.report.service.ModelPeriod;
+
 import junit.framework.Assert;
 
 public class ModelPeriodTest {

cat-core/src/test/java/com/dianping/cat/service/ModelRequestTest.java

@@ -4,6 +4,9 @@ import junit.framework.Assert;
 
 import org.junit.Test;
 
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+
 public class ModelRequestTest {
 
 	@Test

cat-core/src/test/java/com/dianping/cat/service/ModelResponseTest.java

@@ -2,6 +2,8 @@ package com.dianping.cat.service;
 
 import org.junit.Test;
 
+import com.dianping.cat.report.service.ModelResponse;
+
 import junit.framework.Assert;
 
 public class ModelResponseTest {

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

@@ -20,7 +20,6 @@ import com.dianping.cat.consumer.storage.StorageAnalyzer;
 import com.dianping.cat.consumer.top.TopAnalyzer;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.core.config.ConfigDao;
-import com.dianping.cat.dal.ProjectService;
 import com.dianping.cat.home.dal.report.AlertDao;
 import com.dianping.cat.home.dal.report.AlertSummaryDao;
 import com.dianping.cat.home.dal.report.AlterationDao;
@@ -113,7 +112,8 @@ import com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer
 import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder;
 import com.dianping.cat.report.page.storage.transform.StorageMergeHelper;
 import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelService;
+import com.dianping.cat.service.ProjectService;
 
 public class AlarmComponentConfigurator extends AbstractResourceConfigurator {
 	@Override

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

@@ -28,9 +28,6 @@ import com.dianping.cat.consumer.dependency.DependencyAnalyzer;
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
 import com.dianping.cat.core.config.ConfigDao;
-import com.dianping.cat.dal.HostinfoService;
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.ProjectService;
 import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.home.dal.report.AlertDao;
 import com.dianping.cat.home.dal.report.TopologyGraphDao;
@@ -82,8 +79,11 @@ import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder;
 import com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager;
 import com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer;
 import com.dianping.cat.report.page.transaction.service.TransactionReportService;
+import com.dianping.cat.report.service.ModelService;
 import com.dianping.cat.report.task.cmdb.ProjectUpdateTask;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.service.HostinfoService;
+import com.dianping.cat.service.IpService;
+import com.dianping.cat.service.ProjectService;
 import com.dianping.cat.system.page.router.config.RouterConfigManager;
 
 public class ComponentsConfigurator extends AbstractResourceConfigurator {

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

@@ -20,7 +20,6 @@ import com.dianping.cat.consumer.state.StateAnalyzer;
 import com.dianping.cat.consumer.storage.StorageAnalyzer;
 import com.dianping.cat.consumer.top.TopAnalyzer;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
-import com.dianping.cat.dal.IpService;
 import com.dianping.cat.hadoop.hdfs.HdfsMessageBucketManager;
 import com.dianping.cat.message.codec.HtmlMessageCodec;
 import com.dianping.cat.message.codec.WaterfallMessageCodec;
@@ -74,8 +73,9 @@ import com.dianping.cat.report.page.transaction.service.CompositeTransactionServ
 import com.dianping.cat.report.page.transaction.service.HistoricalTransactionService;
 import com.dianping.cat.report.page.transaction.service.LocalTransactionService;
 import com.dianping.cat.report.page.transaction.service.TransactionReportService;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelService;
+import com.dianping.cat.service.IpService;
 
 class ServiceComponentConfigurator extends AbstractResourceConfigurator {
 	@Override

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

@@ -23,8 +23,6 @@ import com.dianping.cat.core.dal.HourlyReportDao;
 import com.dianping.cat.core.dal.MonthlyReportDao;
 import com.dianping.cat.core.dal.TaskDao;
 import com.dianping.cat.core.dal.WeeklyReportDao;
-import com.dianping.cat.dal.HostinfoService;
-import com.dianping.cat.dal.ProjectService;
 import com.dianping.cat.home.dal.report.BaselineDao;
 import com.dianping.cat.core.dal.DailyReportContentDao;
 import com.dianping.cat.core.dal.MonthlyReportContentDao;
@@ -108,6 +106,8 @@ import com.dianping.cat.report.task.notify.NotifyTaskBuilder;
 import com.dianping.cat.report.task.notify.ReportRender;
 import com.dianping.cat.report.task.notify.ReportRenderImpl;
 import com.dianping.cat.report.task.notify.render.AppDataComparisonRender;
+import com.dianping.cat.service.HostinfoService;
+import com.dianping.cat.service.ProjectService;
 import com.dianping.cat.system.page.router.config.RouterConfigManager;
 import com.dianping.cat.system.page.router.service.RouterConfigService;
 import com.dianping.cat.system.page.router.task.RouterConfigBuilder;

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

@@ -4,10 +4,10 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.report.alert.MetricReportGroup.State;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class MetricReportGroupService {
 

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

@@ -19,13 +19,13 @@ import com.dianping.cat.message.Transaction;
 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.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 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.service.ModelService;
 
 public class ExceptionAlert implements Task {
 

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

@@ -29,14 +29,14 @@ 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.heartbeat.config.HeartbeatDisplayPolicyManager;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 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.config.BaseRuleConfigManager;
 import com.dianping.cat.report.alert.sender.AlertEntity;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
 
 public class HeartbeatAlert extends BaseAlert {
 

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

@@ -4,7 +4,7 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.core.dal.Project;
-import com.dianping.cat.dal.ProjectService;
+import com.dianping.cat.service.ProjectService;
 
 import org.unidal.lookup.util.StringUtils;
 

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

@@ -6,9 +6,9 @@ import java.util.List;
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.core.dal.Project;
-import com.dianping.cat.dal.ProjectService;
 import com.dianping.cat.home.alert.config.entity.Receiver;
 import com.dianping.cat.report.alert.sender.config.AlertConfigManager;
+import com.dianping.cat.service.ProjectService;
 
 import org.unidal.lookup.util.StringUtils;
 

cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java

@@ -33,10 +33,10 @@ import com.dianping.cat.report.page.storage.StorageConstants;
 import com.dianping.cat.report.page.storage.config.StorageGroupConfigManager;
 import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder;
 import com.dianping.cat.report.page.storage.transform.StorageMergeHelper;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public abstract class AbstractStorageAlert implements Task, LogEnabled {
 

cat-home/src/main/java/com/dianping/cat/report/alert/summary/build/FailureSummaryBuilder.java

@@ -15,9 +15,9 @@ import com.dianping.cat.report.page.problem.transform.PieGraphChartVisitor;
 import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
 import com.dianping.cat.report.page.problem.transform.ProblemStatistics.StatusStatistics;
 import com.dianping.cat.report.page.problem.transform.ProblemStatistics.TypeStatistics;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class FailureSummaryBuilder extends SummaryBuilder {
 

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

@@ -32,10 +32,10 @@ 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.report.page.transaction.transform.TransactionMergeHelper;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class TransactionAlert implements Task, LogEnabled {
 

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

@@ -28,13 +28,13 @@ 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.page.app.service.AppDataService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
 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.config.BaseRuleConfigManager;
 import com.dianping.cat.report.alert.sender.AlertEntity;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
 
 public class WebAlert extends BaseAlert {
 

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

@@ -13,17 +13,17 @@ import org.unidal.lookup.annotation.Inject;
 import com.dianping.cat.Cat;
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
-import com.dianping.cat.dal.IpService;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.graph.metric.CachedMetricReportService;
 import com.dianping.cat.report.page.cdn.graph.CdnReportConvertor;
 import com.dianping.cat.report.page.metric.service.MetricReportService;
 import com.dianping.cat.report.page.system.graph.SystemReportConvertor;
 import com.dianping.cat.report.page.web.graph.WebReportConvertor;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
+import com.dianping.cat.service.IpService;
 
 public class CachedMetricReportServiceImpl implements CachedMetricReportService {
 

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

@@ -31,10 +31,10 @@ import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.page.activity.config.ActivityConfigManager;
 import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 	@Inject

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

@@ -23,9 +23,9 @@ import com.dianping.cat.report.page.app.Model;
 import com.dianping.cat.report.page.app.Payload;
 import com.dianping.cat.report.page.app.ProblemStatistics;
 import com.dianping.cat.report.page.problem.service.ProblemReportService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class CrashLogProcessor {
 

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

@@ -13,7 +13,7 @@ import com.dianping.cat.home.app.entity.AppReport;
 import com.dianping.cat.home.app.transform.DefaultNativeParser;
 import com.dianping.cat.core.dal.DailyReportContent;
 import com.dianping.cat.core.dal.DailyReportContentEntity;
-import com.dianping.cat.service.AbstractReportService;
+import com.dianping.cat.report.service.AbstractReportService;
 
 public class AppReportService extends AbstractReportService<AppReport> {
 

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

@@ -28,9 +28,9 @@ import com.dianping.cat.report.page.event.service.EventReportService;
 import com.dianping.cat.report.page.transaction.service.TransactionReportService;
 import com.dianping.cat.report.page.transaction.transform.AllMachineMerger;
 import com.dianping.cat.report.page.transaction.transform.AllNameMerger;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 

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

@@ -4,8 +4,8 @@ import com.dianping.cat.consumer.metric.model.entity.MetricItem;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.consumer.metric.model.entity.Segment;
 import com.dianping.cat.consumer.metric.model.transform.BaseVisitor;
-import com.dianping.cat.dal.IpService;
-import com.dianping.cat.dal.IpService.IpInfo;
+import com.dianping.cat.service.IpService;
+import com.dianping.cat.service.IpService.IpInfo;
 
 public class CdnReportConvertor extends BaseVisitor {
 	private IpService m_ipService;

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

@@ -14,16 +14,16 @@ import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.cross.CrossAnalyzer;
 import com.dianping.cat.consumer.cross.model.entity.CrossReport;
-import com.dianping.cat.dal.HostinfoService;
 import com.dianping.cat.mvc.PayloadNormalizer;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.cross.display.HostInfo;
 import com.dianping.cat.report.page.cross.display.MethodInfo;
 import com.dianping.cat.report.page.cross.display.ProjectInfo;
 import com.dianping.cat.report.page.cross.service.CrossReportService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
+import com.dianping.cat.service.HostinfoService;
 
 public class Handler implements PageHandler<Context> {
 	@Inject

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

@@ -12,7 +12,7 @@ import com.dianping.cat.consumer.cross.model.entity.Local;
 import com.dianping.cat.consumer.cross.model.entity.Remote;
 import com.dianping.cat.consumer.cross.model.entity.Type;
 import com.dianping.cat.consumer.cross.model.transform.BaseVisitor;
-import com.dianping.cat.dal.HostinfoService;
+import com.dianping.cat.service.HostinfoService;
 
 import org.unidal.lookup.util.StringUtils;
 

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

@@ -14,7 +14,7 @@ import com.dianping.cat.consumer.cross.model.entity.Name;
 import com.dianping.cat.consumer.cross.model.entity.Remote;
 import com.dianping.cat.consumer.cross.model.entity.Type;
 import com.dianping.cat.consumer.cross.model.transform.BaseVisitor;
-import com.dianping.cat.dal.HostinfoService;
+import com.dianping.cat.service.HostinfoService;
 
 public class MethodInfo extends BaseVisitor {
 

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

@@ -5,10 +5,10 @@ import java.util.List;
 import com.dianping.cat.consumer.cross.CrossAnalyzer;
 import com.dianping.cat.consumer.cross.CrossReportMerger;
 import com.dianping.cat.consumer.cross.model.entity.CrossReport;
-import com.dianping.cat.service.BaseCompositeModelService;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseCompositeModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class CompositeCrossService extends BaseCompositeModelService<CrossReport> {
 	public CompositeCrossService() {

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

@@ -29,7 +29,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent;
 import com.dianping.cat.core.dal.MonthlyReportContentEntity;
 import com.dianping.cat.core.dal.WeeklyReportContent;
 import com.dianping.cat.core.dal.WeeklyReportContentEntity;
-import com.dianping.cat.service.AbstractReportService;
+import com.dianping.cat.report.service.AbstractReportService;
 
 public class CrossReportService extends AbstractReportService<CrossReport> {
 

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

@@ -10,8 +10,8 @@ import com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.BaseHistoricalModelService;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.BaseHistoricalModelService;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class HistoricalCrossService extends BaseHistoricalModelService<CrossReport> {
 	@Inject

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

@@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.mvc.ApiPayload;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class LocalCrossService extends LocalModelService<CrossReport> {
 

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

@@ -7,7 +7,7 @@ import org.xml.sax.SAXException;
 import com.dianping.cat.consumer.cross.CrossAnalyzer;
 import com.dianping.cat.consumer.cross.model.entity.CrossReport;
 import com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser;
-import com.dianping.cat.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
 
 public class RemoteCrossService extends BaseRemoteModelService<CrossReport> {
 	public RemoteCrossService() {

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

@@ -36,10 +36,10 @@ import com.dianping.cat.report.page.problem.transform.ProblemStatistics;
 import com.dianping.cat.report.page.problem.transform.ProblemStatistics.StatusStatistics;
 import com.dianping.cat.report.page.problem.transform.ProblemStatistics.TypeStatistics;
 import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 	@Inject

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

@@ -12,9 +12,9 @@ import com.dianping.cat.home.dependency.graph.entity.TopologyGraph;
 import com.dianping.cat.home.dependency.graph.entity.TopologyNode;
 import com.dianping.cat.report.page.dependency.graph.GraphConstrant;
 import com.dianping.cat.report.page.dependency.service.DependencyReportService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class ExternalInfoBuilder {
 

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

@@ -36,9 +36,9 @@ import com.dianping.cat.report.page.dependency.config.TopoGraphFormatConfigManag
 import com.dianping.cat.report.page.dependency.graph.LineGraphBuilder;
 import com.dianping.cat.report.page.dependency.graph.ProductLinesDashboard;
 import com.dianping.cat.report.page.dependency.graph.TopologyGraphManager;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 

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

@@ -33,10 +33,10 @@ import com.dianping.cat.home.dependency.graph.entity.TopologyGraph;
 import com.dianping.cat.home.dependency.graph.entity.TopologyNode;
 import com.dianping.cat.home.dependency.graph.transform.DefaultNativeParser;
 import com.dianping.cat.message.Transaction;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class TopologyGraphManager implements Initializable, LogEnabled {
 

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

@@ -5,10 +5,10 @@ import java.util.List;
 import com.dianping.cat.consumer.dependency.DependencyAnalyzer;
 import com.dianping.cat.consumer.dependency.DependencyReportMerger;
 import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
-import com.dianping.cat.service.BaseCompositeModelService;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseCompositeModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class CompositeDependencyService extends BaseCompositeModelService<DependencyReport> {
 	public CompositeDependencyService() {

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

@@ -17,7 +17,7 @@ import com.dianping.cat.core.dal.HourlyReportContent;
 import com.dianping.cat.core.dal.HourlyReportContentEntity;
 import com.dianping.cat.core.dal.HourlyReportEntity;
 import com.dianping.cat.helper.TimeHelper;
-import com.dianping.cat.service.AbstractReportService;
+import com.dianping.cat.report.service.AbstractReportService;
 
 public class DependencyReportService extends AbstractReportService<DependencyReport> {
 

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

@@ -10,8 +10,8 @@ import com.dianping.cat.consumer.dependency.model.transform.DefaultSaxParser;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.BaseHistoricalModelService;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.BaseHistoricalModelService;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class HistoricalDependencyService extends BaseHistoricalModelService<DependencyReport> {
 	@Inject

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

@@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.mvc.ApiPayload;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class LocalDependencyService extends LocalModelService<DependencyReport> {
 

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

@@ -7,7 +7,7 @@ import org.xml.sax.SAXException;
 import com.dianping.cat.consumer.dependency.DependencyAnalyzer;
 import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
 import com.dianping.cat.consumer.dependency.model.transform.DefaultSaxParser;
-import com.dianping.cat.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
 
 public class RemoteDependencyService extends BaseRemoteModelService<DependencyReport> {
 	public RemoteDependencyService() {

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

@@ -31,9 +31,9 @@ import com.dianping.cat.report.page.event.service.EventReportService;
 import com.dianping.cat.report.page.event.transform.DistributionDetailVisitor;
 import com.dianping.cat.report.page.event.transform.EventMergeHelper;
 import com.dianping.cat.report.page.event.transform.PieGraphChartVisitor;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 

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

@@ -5,10 +5,10 @@ import java.util.List;
 import com.dianping.cat.consumer.event.EventAnalyzer;
 import com.dianping.cat.consumer.event.EventReportMerger;
 import com.dianping.cat.consumer.event.model.entity.EventReport;
-import com.dianping.cat.service.BaseCompositeModelService;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseCompositeModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class CompositeEventService extends BaseCompositeModelService<EventReport> {
 	public CompositeEventService() {

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

@@ -33,7 +33,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent;
 import com.dianping.cat.core.dal.MonthlyReportContentEntity;
 import com.dianping.cat.core.dal.WeeklyReportContent;
 import com.dianping.cat.core.dal.WeeklyReportContentEntity;
-import com.dianping.cat.service.AbstractReportService;
+import com.dianping.cat.report.service.AbstractReportService;
 
 public class EventReportService extends AbstractReportService<EventReport> {
 

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

@@ -10,8 +10,8 @@ import com.dianping.cat.consumer.event.model.transform.DefaultSaxParser;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.BaseHistoricalModelService;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.BaseHistoricalModelService;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class HistoricalEventService extends BaseHistoricalModelService<EventReport> {
 	@Inject

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

@@ -14,9 +14,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.mvc.ApiPayload;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class LocalEventService extends LocalModelService<EventReport> {
 

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

@@ -7,7 +7,7 @@ import org.xml.sax.SAXException;
 import com.dianping.cat.consumer.event.EventAnalyzer;
 import com.dianping.cat.consumer.event.model.entity.EventReport;
 import com.dianping.cat.consumer.event.model.transform.DefaultSaxParser;
-import com.dianping.cat.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
 
 public class RemoteEventService extends BaseRemoteModelService<EventReport> {
 	public RemoteEventService() {

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

@@ -28,10 +28,10 @@ import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.svg.GraphBuilder;
 import com.dianping.cat.report.page.heartbeat.config.HeartbeatDisplayPolicyManager;
 import com.dianping.cat.report.page.heartbeat.service.HeartbeatReportService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 	@Inject

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

@@ -5,10 +5,10 @@ import java.util.List;
 import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer;
 import com.dianping.cat.consumer.heartbeat.HeartbeatReportMerger;
 import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport;
-import com.dianping.cat.service.BaseCompositeModelService;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseCompositeModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class CompositeHeartbeatService extends BaseCompositeModelService<HeartbeatReport> {
 	public CompositeHeartbeatService() {

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

@@ -25,7 +25,7 @@ import com.dianping.cat.core.dal.HourlyReportEntity;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.core.dal.DailyReportContent;
 import com.dianping.cat.core.dal.DailyReportContentEntity;
-import com.dianping.cat.service.AbstractReportService;
+import com.dianping.cat.report.service.AbstractReportService;
 
 public class HeartbeatReportService extends AbstractReportService<HeartbeatReport> {
 

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

@@ -10,8 +10,8 @@ import com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.BaseHistoricalModelService;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.BaseHistoricalModelService;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class HistoricalHeartbeatService extends BaseHistoricalModelService<HeartbeatReport> {
 	@Inject

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

@@ -15,9 +15,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.mvc.ApiPayload;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class LocalHeartbeatService extends LocalModelService<HeartbeatReport> {
 

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

@@ -7,7 +7,7 @@ import org.xml.sax.SAXException;
 import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer;
 import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport;
 import com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser;
-import com.dianping.cat.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
 
 public class RemoteHeartbeatService extends BaseRemoteModelService<HeartbeatReport> {
 	public RemoteHeartbeatService() {

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

@@ -16,9 +16,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.message.Event;
 import com.dianping.cat.message.internal.MessageId;
 import com.dianping.cat.report.ReportPage;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 	@Inject

cat-home/src/main/java/com/dianping/cat/report/page/logview/service/CompositeLogViewService.java

@@ -2,10 +2,10 @@ package com.dianping.cat.report.page.logview.service;
 
 import java.util.List;
 
-import com.dianping.cat.service.BaseCompositeModelService;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseCompositeModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class CompositeLogViewService extends BaseCompositeModelService<String> {
 	public CompositeLogViewService() {

cat-home/src/main/java/com/dianping/cat/report/page/logview/service/HistoricalMessageService.java

@@ -17,8 +17,8 @@ import com.dianping.cat.message.internal.MessageId;
 import com.dianping.cat.message.spi.MessageCodec;
 import com.dianping.cat.message.spi.MessageTree;
 import com.dianping.cat.message.storage.MessageBucketManager;
-import com.dianping.cat.service.BaseHistoricalModelService;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.BaseHistoricalModelService;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class HistoricalMessageService  extends BaseHistoricalModelService<String> {
 	@Inject(HdfsMessageBucketManager.ID)

cat-home/src/main/java/com/dianping/cat/report/page/logview/service/LocalMessageService.java

@@ -19,11 +19,11 @@ import com.dianping.cat.message.spi.MessageCodec;
 import com.dianping.cat.message.spi.MessageTree;
 import com.dianping.cat.message.storage.MessageBucketManager;
 import com.dianping.cat.mvc.ApiPayload;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class LocalMessageService extends LocalModelService<String> implements ModelService<String> {
 

cat-home/src/main/java/com/dianping/cat/report/page/logview/service/RemoteLogViewService.java

@@ -13,10 +13,10 @@ import com.dianping.cat.config.server.ServerConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class RemoteLogViewService extends BaseRemoteModelService<String> {
 	

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

@@ -16,9 +16,9 @@ import com.dianping.cat.consumer.matrix.model.entity.MatrixReport;
 import com.dianping.cat.mvc.PayloadNormalizer;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.page.matrix.service.MatrixReportService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
-import com.dianping.cat.service.ModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
+import com.dianping.cat.report.service.ModelService;
 
 public class Handler implements PageHandler<Context> {
 

cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/CompositeMatrixService.java

@@ -5,10 +5,10 @@ import java.util.List;
 import com.dianping.cat.consumer.matrix.MatrixAnalyzer;
 import com.dianping.cat.consumer.matrix.MatrixReportMerger;
 import com.dianping.cat.consumer.matrix.model.entity.MatrixReport;
-import com.dianping.cat.service.BaseCompositeModelService;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseCompositeModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class CompositeMatrixService extends BaseCompositeModelService<MatrixReport> {
 	public CompositeMatrixService() {

cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/HistoricalMatrixService.java

@@ -10,8 +10,8 @@ import com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.BaseHistoricalModelService;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.BaseHistoricalModelService;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class HistoricalMatrixService extends BaseHistoricalModelService<MatrixReport> {
 	@Inject

cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/LocalMatrixService.java

@@ -11,9 +11,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.mvc.ApiPayload;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class LocalMatrixService extends LocalModelService<MatrixReport> {
 	

cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/MatrixReportService.java

@@ -29,7 +29,7 @@ import com.dianping.cat.core.dal.MonthlyReportContent;
 import com.dianping.cat.core.dal.MonthlyReportContentEntity;
 import com.dianping.cat.core.dal.WeeklyReportContent;
 import com.dianping.cat.core.dal.WeeklyReportContentEntity;
-import com.dianping.cat.service.AbstractReportService;
+import com.dianping.cat.report.service.AbstractReportService;
 
 public class MatrixReportService extends AbstractReportService<MatrixReport> {
 

cat-home/src/main/java/com/dianping/cat/report/page/matrix/service/RemoteMatrixService.java

@@ -7,7 +7,7 @@ import org.xml.sax.SAXException;
 import com.dianping.cat.consumer.matrix.MatrixAnalyzer;
 import com.dianping.cat.consumer.matrix.model.entity.MatrixReport;
 import com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser;
-import com.dianping.cat.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
 
 public class RemoteMatrixService extends BaseRemoteModelService<MatrixReport> {
 	public RemoteMatrixService() {

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

@@ -19,13 +19,13 @@ import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig;
 import com.dianping.cat.consumer.metric.config.entity.Tag;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.core.dal.Project;
-import com.dianping.cat.dal.ProjectService;
 import com.dianping.cat.helper.Chinese;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.alert.AlertInfo.AlertMetric;
 import com.dianping.cat.report.alert.MetricType;
 import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.graph.metric.AbstractGraphCreator;
+import com.dianping.cat.service.ProjectService;
 
 public class GraphCreator extends AbstractGraphCreator {
 

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

@@ -4,10 +4,10 @@ import java.util.List;
 
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
-import com.dianping.cat.service.BaseCompositeModelService;
-import com.dianping.cat.service.BaseRemoteModelService;
-import com.dianping.cat.service.ModelRequest;
-import com.dianping.cat.service.ModelResponse;
+import com.dianping.cat.report.service.BaseCompositeModelService;
+import com.dianping.cat.report.service.BaseRemoteModelService;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.report.service.ModelResponse;
 
 public class CompositeMetricService extends BaseCompositeModelService<MetricReport> {
 	public CompositeMetricService() {

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

@@ -19,9 +19,9 @@ import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.dal.report.Baseline;
 import com.dianping.cat.home.dal.report.BaselineDao;
 import com.dianping.cat.home.dal.report.BaselineEntity;
+import com.dianping.cat.report.service.ModelPeriod;
 import com.dianping.cat.report.task.TaskHelper;
 import com.dianping.cat.report.alert.MetricType;
-import com.dianping.cat.service.ModelPeriod;
 
 public class DefaultBaselineService implements BaselineService {
 

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

@@ -10,8 +10,8 @@ import com.dianping.cat.consumer.metric.model.transform.DefaultSaxParser;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportBucket;
 import com.dianping.cat.report.ReportBucketManager;
-import com.dianping.cat.service.BaseHistoricalModelService;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.BaseHistoricalModelService;
+import com.dianping.cat.report.service.ModelRequest;
 
 public class HistoricalMetricService extends BaseHistoricalModelService<MetricReport> {
 	@Inject

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

@@ -11,7 +11,6 @@ import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
 import com.dianping.cat.consumer.metric.model.transform.DefaultSaxParser;
-import com.dianping.cat.dal.IpService;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.mvc.ApiPayload;
 import com.dianping.cat.report.ReportBucket;
@@ -19,9 +18,10 @@ import com.dianping.cat.report.ReportBucketManager;
 import com.dianping.cat.report.page.cdn.graph.CdnReportConvertor;
 import com.dianping.cat.report.page.system.graph.SystemReportConvertor;
 import com.dianping.cat.report.page.web.graph.WebReportConvertor;
-import com.dianping.cat.service.LocalModelService;
-import com.dianping.cat.service.ModelPeriod;
-import com.dianping.cat.service.ModelRequest;
+import com.dianping.cat.report.service.LocalModelService;
+import com.dianping.cat.report.service.ModelPeriod;
+import com.dianping.cat.report.service.ModelRequest;
+import com.dianping.cat.service.IpService;
 
 public class LocalMetricService extends LocalModelService<MetricReport> {
 	

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

@@ -19,7 +19,7 @@ import com.dianping.cat.consumer.metric.model.entity.Point;
 import com.dianping.cat.consumer.metric.model.entity.Segment;
 import com.dianping.cat.consumer.metric.model.transform.DefaultNativeParser;
 import com.dianping.cat.message.Event;
-import com.dianping.cat.service.AbstractReportService;
+import com.dianping.cat.report.service.AbstractReportService;
 
 public class MetricReportService extends AbstractReportService<MetricReport> {