refactor code

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

@@ -16,6 +16,7 @@ import com.dianping.cat.config.content.DefaultContentFetcher;
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.consumer.CatConsumerModule;
 import com.dianping.cat.consumer.RealtimeConsumer;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.cross.CrossAnalyzer;
 import com.dianping.cat.consumer.cross.CrossDelegate;
 import com.dianping.cat.consumer.cross.IpConvertManager;
@@ -38,7 +39,6 @@ import com.dianping.cat.consumer.problem.LongExecutionProblemHandler;
 import com.dianping.cat.consumer.problem.ProblemAnalyzer;
 import com.dianping.cat.consumer.problem.ProblemDelegate;
 import com.dianping.cat.consumer.problem.ProblemHandler;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.consumer.state.StateAnalyzer;
 import com.dianping.cat.consumer.state.StateDelegate;
 import com.dianping.cat.consumer.storage.StorageAnalyzer;
@@ -53,6 +53,7 @@ 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.hadoop.hdfs.HdfsUploader;
+import com.dianping.cat.message.spi.core.DomainValidator;
 import com.dianping.cat.message.spi.core.MessageConsumer;
 import com.dianping.cat.message.spi.core.MessagePathBuilder;
 import com.dianping.cat.service.DefaultReportManager;
@@ -103,7 +104,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ReportManager.class, ID).req(ServerConfigManager.class, IpConvertManager.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, CrossDelegate.class).req(TaskManager.class, ServerConfigManager.class));
 
@@ -119,7 +120,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ServerConfigManager.class, DatabaseParser.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, DependencyDelegate.class).req(TaskManager.class));
 
@@ -147,7 +148,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ReportManager.class, ID).req(ServerConfigManager.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, EventDelegate.class).req(TaskManager.class, ServerConfigManager.class));
 
@@ -162,7 +163,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ReportManager.class, ID).req(ServerConfigManager.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, HeartbeatDelegate.class).req(TaskManager.class, ServerConfigManager.class));
 
@@ -177,7 +178,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ReportManager.class, ID).req(ServerConfigManager.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, MatrixDelegate.class).req(TaskManager.class, ServerConfigManager.class));
 
@@ -213,7 +214,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		            new String[] { DefaultProblemHandler.ID, LongExecutionProblemHandler.ID }, "m_handlers"));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, ProblemDelegate.class) //
 		      .req(TaskManager.class, ServerConfigManager.class));
@@ -230,7 +231,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ServerStatisticManager.class, ServerConfigManager.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, StateDelegate.class) //
 		      .req(TaskManager.class, ReportBucketManager.class));
@@ -246,7 +247,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ReportManager.class, ID).req(ServerConfigManager.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, TopDelegate.class));
 
@@ -261,7 +262,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(ReportManager.class, ID).req(ReportDelegate.class, ID).req(ServerConfigManager.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, TransactionDelegate.class).req(TaskManager.class, ServerConfigManager.class));
 
@@ -279,7 +280,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(com.dianping.cat.consumer.storage.DatabaseParser.class).req(StorageReportUpdater.class));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
 		      .req(ReportDelegate.class, ID) //
-		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class) //
+		      .req(ReportBucketManager.class, HourlyReportDao.class, HourlyReportContentDao.class, DomainValidator.class) //
 		      .config(E("name").value(ID)));
 		all.add(C(ReportDelegate.class, ID, StorageDelegate.class).req(TaskManager.class, ServerConfigManager.class,
 		      StorageReportUpdater.class));

cat-consumer/src/main/java/com/dianping/cat/consumer/productline/ProductLineConfig.java → cat-consumer/src/main/java/com/dianping/cat/consumer/config/ProductLineConfig.java

-package com.dianping.cat.consumer.productline;
+package com.dianping.cat.consumer.config;
 
 import java.util.ArrayList;
 import java.util.List;

cat-consumer/src/main/java/com/dianping/cat/consumer/productline/ProductLineConfigManager.java → cat-consumer/src/main/java/com/dianping/cat/consumer/config/ProductLineConfigManager.java

-package com.dianping.cat.consumer.productline;
+package com.dianping.cat.consumer.config;
 
 import java.io.IOException;
 import java.util.ArrayList;

cat-consumer/src/main/java/com/dianping/cat/consumer/metric/MetricAnalyzer.java

@@ -14,6 +14,8 @@ import com.dianping.cat.Cat;
 import com.dianping.cat.Constants;
 import com.dianping.cat.analysis.AbstractMessageAnalyzer;
 import com.dianping.cat.configuration.NetworkInterfaceManager;
+import com.dianping.cat.consumer.config.ProductLineConfig;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.dal.BusinessReport;
 import com.dianping.cat.consumer.dal.BusinessReportDao;
 import com.dianping.cat.consumer.metric.model.entity.MetricItem;
@@ -22,8 +24,6 @@ import com.dianping.cat.consumer.metric.model.entity.Segment;
 import com.dianping.cat.consumer.metric.model.transform.DefaultNativeBuilder;
 import com.dianping.cat.consumer.metric.model.transform.DefaultSaxParser;
 import com.dianping.cat.consumer.metric.model.transform.DefaultXmlBuilder;
-import com.dianping.cat.consumer.productline.ProductLineConfig;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Metric;
 import com.dianping.cat.message.Transaction;

cat-consumer/src/main/java/com/dianping/cat/consumer/metric/MetricConfigManager.java

@@ -24,13 +24,13 @@ import org.xml.sax.SAXException;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.config.content.ContentFetcher;
+import com.dianping.cat.consumer.config.ProductLineConfig;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.MetricAnalyzer.ConfigItem;
 import com.dianping.cat.consumer.metric.config.entity.MetricConfig;
 import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig;
 import com.dianping.cat.consumer.metric.config.entity.Tag;
 import com.dianping.cat.consumer.metric.config.transform.DefaultSaxParser;
-import com.dianping.cat.consumer.productline.ProductLineConfig;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.core.config.Config;
 import com.dianping.cat.core.config.ConfigDao;
 import com.dianping.cat.core.config.ConfigEntity;

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

@@ -55,6 +55,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -106,6 +109,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -188,6 +194,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -239,6 +248,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -290,6 +302,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -385,6 +400,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -443,6 +461,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -494,6 +515,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -552,6 +576,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
@@ -569,8 +596,8 @@
 			<implementation>com.dianping.cat.config.content.DefaultContentFetcher</implementation>
 		</component>
 		<component>
-			<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
-			<implementation>com.dianping.cat.consumer.productline.ProductLineConfigManager</implementation>
+			<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
+			<implementation>com.dianping.cat.consumer.config.ProductLineConfigManager</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.config.ConfigDao</role>
@@ -591,7 +618,7 @@
 					<role>com.dianping.cat.config.content.ContentFetcher</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -611,7 +638,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.task.TaskManager</role>
@@ -675,6 +702,9 @@
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.spi.core.DomainValidator</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>

cat-consumer/src/test/java/com/dianping/cat/consumer/metric/MetricAnalyzerTest.java

@@ -24,13 +24,13 @@ import org.unidal.tuple.Pair;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.consumer.config.ProductLineConfig;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.dal.BusinessReport;
 import com.dianping.cat.consumer.dal.BusinessReportDao;
 import com.dianping.cat.consumer.metric.MetricAnalyzer.ConfigItem;
 import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
-import com.dianping.cat.consumer.productline.ProductLineConfig;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.message.internal.DefaultEvent;
 import com.dianping.cat.message.internal.DefaultMetric;
 import com.dianping.cat.message.internal.DefaultTransaction;

cat-consumer/src/test/java/com/dianping/cat/consumer/metric/ProductLineConfigManagerTest.java

@@ -15,8 +15,8 @@ import org.unidal.dal.jdbc.Updateset;
 import com.dianping.cat.consumer.MockLog;
 import com.dianping.cat.consumer.company.model.entity.Company;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
-import com.dianping.cat.consumer.productline.ProductLineConfig;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfig;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.core.config.Config;
 import com.dianping.cat.core.config.ConfigDao;
 

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

@@ -25,6 +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.message.spi.core.DomainValidator;
 import com.dianping.cat.storage.report.ReportBucket;
 import com.dianping.cat.storage.report.ReportBucketManager;
 
@@ -45,6 +46,9 @@ public class DefaultReportManager<T> implements ReportManager<T>, LogEnabled {
 	@Inject
 	private HourlyReportContentDao m_reportContentDao;
 
+	@Inject
+	private DomainValidator m_validator;
+
 	private String m_name;
 
 	private Map<Long, Map<String, T>> m_reports = new ConcurrentHashMap<Long, Map<String, T>>();
@@ -74,7 +78,15 @@ public class DefaultReportManager<T> implements ReportManager<T>, LogEnabled {
 		if (reports == null) {
 			return new HashSet<String>();
 		} else {
-			return reports.keySet();
+			Set<String> domains = reports.keySet();
+			Set<String> result = new HashSet<String>();
+
+			for (String domain : domains) {
+				if (m_validator.validate(domain)) {
+					result.add(domain);
+				}
+			}
+			return result;
 		}
 	}
 
@@ -197,6 +209,20 @@ public class DefaultReportManager<T> implements ReportManager<T>, LogEnabled {
 		try {
 			t.addData("reports", reports == null ? 0 : reports.size());
 
+			Set<String> errorDomains = new HashSet<String>();
+
+			for (String domain : reports.keySet()) {
+				if (!m_validator.validate(domain)) {
+					errorDomains.add(domain);
+				}
+			}
+			for (String domain : errorDomains) {
+				reports.remove(domain);
+			}
+			if (!errorDomains.isEmpty()) {
+				m_logger.info("error domain:" + errorDomains);
+			}
+
 			if (reports != null) {
 				m_reportDelegate.beforeSave(reports);
 
@@ -204,52 +230,14 @@ public class DefaultReportManager<T> implements ReportManager<T>, LogEnabled {
 					bucket = m_bucketManager.getReportBucket(startTime, m_name);
 
 					try {
-						for (T report : reports.values()) {
-							try {
-								String domain = m_reportDelegate.getDomain(report);
-								String xml = m_reportDelegate.buildXml(report);
-
-								bucket.storeById(domain, xml);
-							} catch (Exception e) {
-								t.setStatus(e);
-								Cat.logError(e);
-							}
-						}
+						storFile(reports, bucket);
 					} finally {
 						m_bucketManager.closeBucket(bucket);
 					}
 				}
 
 				if (policy.forDatabase()) {
-					Date period = new Date(startTime);
-					String ip = NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
-
-					for (T report : reports.values()) {
-						try {
-							String domain = m_reportDelegate.getDomain(report);
-							HourlyReport r = m_reportDao.createLocal();
-
-							r.setName(m_name);
-							r.setDomain(domain);
-							r.setPeriod(period);
-							r.setIp(ip);
-							r.setType(1);
-
-							m_reportDao.insert(r);
-
-							int id = r.getId();
-							byte[] binaryContent = m_reportDelegate.buildBinary(report);
-							HourlyReportContent content = m_reportContentDao.createLocal();
-
-							content.setReportId(id);
-							content.setContent(binaryContent);
-							m_reportContentDao.insert(content);
-							m_reportDelegate.createHourlyTask(report);
-						} catch (Throwable e) {
-							t.setStatus(e);
-							Cat.getProducer().logError(e);
-						}
-					}
+					storeDatabase(startTime, reports);
 				}
 			}
 			t.setStatus(Message.SUCCESS);
@@ -267,6 +255,50 @@ public class DefaultReportManager<T> implements ReportManager<T>, LogEnabled {
 		}
 	}
 
+	private void storeDatabase(long startTime, Map<String, T> reports) {
+		Date period = new Date(startTime);
+		String ip = NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
+
+		for (T report : reports.values()) {
+			try {
+				String domain = m_reportDelegate.getDomain(report);
+				HourlyReport r = m_reportDao.createLocal();
+
+				r.setName(m_name);
+				r.setDomain(domain);
+				r.setPeriod(period);
+				r.setIp(ip);
+				r.setType(1);
+
+				m_reportDao.insert(r);
+
+				int id = r.getId();
+				byte[] binaryContent = m_reportDelegate.buildBinary(report);
+				HourlyReportContent content = m_reportContentDao.createLocal();
+
+				content.setReportId(id);
+				content.setContent(binaryContent);
+				m_reportContentDao.insert(content);
+				m_reportDelegate.createHourlyTask(report);
+			} catch (Throwable e) {
+				Cat.getProducer().logError(e);
+			}
+		}
+	}
+
+	private void storFile(Map<String, T> reports, ReportBucket<String> bucket) {
+		for (T report : reports.values()) {
+			try {
+				String domain = m_reportDelegate.getDomain(report);
+				String xml = m_reportDelegate.buildXml(report);
+
+				bucket.storeById(domain, xml);
+			} catch (Exception e) {
+				Cat.logError(e);
+			}
+		}
+	}
+
 	public static enum StoragePolicy {
 		FILE,
 

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

@@ -11,11 +11,11 @@ import com.dianping.cat.config.app.AppConfigManager;
 import com.dianping.cat.config.content.ContentFetcher;
 import com.dianping.cat.config.url.UrlPatternConfigManager;
 import com.dianping.cat.configuration.ServerConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzer;
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
 import com.dianping.cat.consumer.problem.ProblemAnalyzer;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.consumer.top.TopAnalyzer;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.core.config.ConfigDao;

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

@@ -21,10 +21,10 @@ import com.dianping.cat.config.black.BlackListManager;
 import com.dianping.cat.config.content.ContentFetcher;
 import com.dianping.cat.config.content.DefaultContentFetcher;
 import com.dianping.cat.configuration.ServerConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 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.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
 import com.dianping.cat.core.config.ConfigDao;
 import com.dianping.cat.helper.JsonBuilder;

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

@@ -12,8 +12,8 @@ import com.dianping.cat.config.app.AppComparisonConfigManager;
 import com.dianping.cat.config.app.AppConfigManager;
 import com.dianping.cat.config.app.AppSpeedConfigManager;
 import com.dianping.cat.configuration.ServerConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.core.config.ConfigDao;
 import com.dianping.cat.core.dal.DailyGraphDao;
 import com.dianping.cat.core.dal.DailyReportDao;

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

@@ -13,8 +13,8 @@ import org.unidal.tuple.Pair;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.model.entity.MetricItem;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.rule.entity.Condition;
 import com.dianping.cat.home.rule.entity.Config;

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

@@ -10,10 +10,10 @@ import org.unidal.tuple.Pair;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.consumer.config.ProductLineConfig;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
 import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig;
 import com.dianping.cat.consumer.metric.config.entity.Tag;
-import com.dianping.cat.consumer.productline.ProductLineConfig;
 import com.dianping.cat.home.rule.entity.Condition;
 import com.dianping.cat.home.rule.entity.Config;
 import com.dianping.cat.message.Event;

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

@@ -5,7 +5,7 @@ import java.util.Date;
 
 import org.unidal.lookup.annotation.Inject;
 
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.report.alert.AlertType;
 import com.dianping.cat.report.alert.sender.AlertEntity;
 import com.dianping.cat.report.alert.summary.AlertSummaryExecutor;

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

@@ -12,9 +12,9 @@ import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.unidal.lookup.annotation.Inject;
 
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.graph.LineChart;
 import com.dianping.cat.report.service.BaselineService;

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

@@ -16,7 +16,7 @@ import org.unidal.web.mvc.annotation.OutboundActionMeta;
 import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.LineChart;

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

@@ -22,9 +22,9 @@ import com.dianping.cat.Constants;
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.consumer.company.model.entity.Domain;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.dependency.DependencyAnalyzer;
 import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.dal.report.TopologyGraphDao;
 import com.dianping.cat.home.dal.report.TopologyGraphEntity;

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

@@ -14,10 +14,10 @@ import org.unidal.lookup.util.StringUtils;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.consumer.config.ProductLineConfig;
 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.consumer.productline.ProductLineConfig;
 import com.dianping.cat.core.dal.Project;
 import com.dianping.cat.helper.Chinese;
 import com.dianping.cat.helper.TimeHelper;

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

@@ -15,9 +15,9 @@ import org.unidal.web.mvc.annotation.InboundActionMeta;
 import org.unidal.web.mvc.annotation.OutboundActionMeta;
 import org.unidal.web.mvc.annotation.PayloadMeta;
 
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.LineChart;

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

@@ -12,7 +12,7 @@ import org.unidal.web.mvc.annotation.OutboundActionMeta;
 import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.Cat;
-import com.dianping.cat.consumer.productline.ProductLineConfig;
+import com.dianping.cat.consumer.config.ProductLineConfig;
 import com.dianping.cat.helper.JsonBuilder;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Metric;

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

@@ -17,7 +17,7 @@ import org.unidal.web.mvc.annotation.OutboundActionMeta;
 import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.LineChart;

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

@@ -18,8 +18,8 @@ import org.unidal.web.mvc.annotation.OutboundActionMeta;
 import org.unidal.web.mvc.annotation.PayloadMeta;
 
 import com.dianping.cat.Constants;
-import com.dianping.cat.consumer.productline.ProductLineConfig;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfig;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.report.ReportPage;
 import com.dianping.cat.report.graph.LineChart;

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

@@ -11,12 +11,12 @@ import org.codehaus.plexus.logging.Logger;
 import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.MetricAnalyzer;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
 import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig;
 import com.dianping.cat.consumer.metric.model.entity.MetricItem;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.dal.report.Baseline;
 import com.dianping.cat.report.service.BaselineService;

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

@@ -9,8 +9,8 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.Constants;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.model.entity.MetricReport;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.core.dal.DailyReport;
 import com.dianping.cat.helper.TimeHelper;
 import com.dianping.cat.home.system.entity.SystemReport;

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

@@ -5,8 +5,8 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.config.black.BlackListManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 
 public class ConfigReloadTask implements Task {
 

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

@@ -13,8 +13,8 @@ import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.consumer.metric.config.entity.MetricItemConfig;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.consumer.metric.MetricConfigManager;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
 import com.dianping.cat.home.rule.entity.Rule;
 import com.dianping.cat.home.rule.transform.DefaultJsonBuilder;
 import com.dianping.cat.system.config.BusinessRuleConfigManager;

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

@@ -6,7 +6,7 @@ import org.unidal.tuple.Pair;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.consumer.company.model.entity.ProductLine;
-import com.dianping.cat.consumer.productline.ProductLineConfigManager;
+import com.dianping.cat.consumer.config.ProductLineConfigManager;
 import com.dianping.cat.home.dependency.config.entity.DomainConfig;
 import com.dianping.cat.home.dependency.config.entity.EdgeConfig;
 import com.dianping.cat.report.page.dependency.graph.TopologyGraphConfigManager;

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

@@ -74,7 +74,7 @@
 					<role>com.dianping.cat.configuration.ServerConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.home.dal.report.TopologyGraphDao</role>
@@ -358,7 +358,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.system.config.RouterConfigManager</role>
@@ -1121,7 +1121,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.task.metric.BaselineCreator</role>
@@ -1390,7 +1390,7 @@
 					<role>com.dianping.cat.report.service.ReportServiceManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.graph.metric.CachedMetricReportService</role>
@@ -2760,7 +2760,7 @@
 			<implementation>com.dianping.cat.report.alert.sender.decorator.BusinessDecorator</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.summary.AlertSummaryExecutor</role>
@@ -2942,7 +2942,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -2969,7 +2969,7 @@
 			<implementation>com.dianping.cat.report.alert.network.NetworkAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -2993,7 +2993,7 @@
 			<implementation>com.dianping.cat.report.alert.database.DatabaseAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -3017,7 +3017,7 @@
 			<implementation>com.dianping.cat.report.alert.heartbeat.HeartbeatAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.system.config.HeartbeatDisplayPolicyManager</role>
@@ -3057,7 +3057,7 @@
 			<implementation>com.dianping.cat.report.alert.system.SystemAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -3102,7 +3102,7 @@
 			<implementation>com.dianping.cat.report.alert.web.WebAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -3129,7 +3129,7 @@
 			<implementation>com.dianping.cat.report.alert.transaction.TransactionAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -4212,7 +4212,7 @@
 					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.metric.GraphCreator</role>
@@ -4232,8 +4232,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
-			<implementation>com.dianping.cat.consumer.productline.ProductLineConfigManager</implementation>
+			<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
+			<implementation>com.dianping.cat.consumer.config.ProductLineConfigManager</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.config.ConfigDao</role>
@@ -4266,7 +4266,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -4305,7 +4305,7 @@
 					<role>com.dianping.cat.config.content.ContentFetcher</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -4360,7 +4360,7 @@
 					<role>com.dianping.cat.report.page.dependency.graph.DependencyItemBuilder</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.configuration.ServerConfigManager</role>
@@ -4586,7 +4586,7 @@
 					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.network.GraphCreator</role>
@@ -4625,7 +4625,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -4748,7 +4748,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -4769,7 +4769,7 @@
 					<role>com.dianping.cat.report.page.system.graph.SystemGraphCreator</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -4802,7 +4802,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -4853,7 +4853,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -5179,7 +5179,7 @@
 					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.database.GraphCreator</role>
@@ -5215,7 +5215,7 @@
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.AlertInfo</role>
@@ -5557,7 +5557,7 @@
 			<implementation>com.dianping.cat.system.page.config.processor.TopologyConfigProcessor</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.system.page.config.processor.GlobalConfigProcessor</role>
@@ -5578,7 +5578,7 @@
 					<role>com.dianping.cat.system.page.config.processor.GlobalConfigProcessor</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.consumer.productline.ProductLineConfigManager</role>
+					<role>com.dianping.cat.consumer.config.ProductLineConfigManager</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>