From 811ba50c89eee0911dad3a999a6b561b042fd53c Mon Sep 17 00:00:00 2001
From: "yong.you" <yong.you@dianping.com>
Date: Thu, 25 Apr 2013 16:01:19 +0800
Subject: [PATCH] fix the componment init error

---
 .../cat/build/ComponentsConfigurator.java      | 18 ++++++++++--------
 .../resources/META-INF/plexus/components.xml   | 16 ++++++++++------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
index 3ee996cf0..d477061bd 100755
--- a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
+++ b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
@@ -104,11 +104,13 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		all.add(C(HeartbeatMerger.class));
 		all.add(C(CrossMerger.class));
 		all.add(C(DatabaseMerger.class));
+		all.add(C(MatrixMerger.class));
 		all.add(C(SqlMerger.class));
 		all.add(C(StateMerger.class));
 
 		all.add(C(TransactionReportBuilder.class) //
-		      .req(GraphDao.class, DailygraphDao.class, ReportDao.class, DailyreportDao.class, TransactionGraphCreator.class)//
+		      .req(GraphDao.class, DailygraphDao.class, ReportDao.class, DailyreportDao.class,
+		            TransactionGraphCreator.class)//
 		      .req(TransactionMerger.class, WeeklyreportDao.class, MonthreportDao.class));
 
 		all.add(C(EventReportBuilder.class) //
@@ -122,17 +124,16 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 
 		all.add(C(HeartbeatReportBuilder.class) //
 		      .req(GraphDao.class, DailygraphDao.class, ReportDao.class, DailyreportDao.class) //
-		      .req( HeartbeatGraphCreator.class,
-		            HeartbeatMerger.class, WeeklyreportDao.class, MonthreportDao.class));
-
-		all.add(C(MatrixReportBuilder.class) //
-		      .req(GraphDao.class, DailygraphDao.class, ReportDao.class, DailyreportDao.class, MatrixMerger.class)//
-		      .req(WeeklyreportDao.class, MonthreportDao.class));
+		      .req(HeartbeatGraphCreator.class, HeartbeatMerger.class, WeeklyreportDao.class, MonthreportDao.class));
 
 		all.add(C(DatabaseReportBuilder.class) //
 		      .req(GraphDao.class, DailygraphDao.class, ReportDao.class, DailyreportDao.class, DatabaseMerger.class)//
 		      .req(WeeklyreportDao.class, MonthreportDao.class));
 
+		all.add(C(MatrixReportBuilder.class) //
+		      .req(GraphDao.class, DailygraphDao.class, ReportDao.class, DailyreportDao.class, MatrixMerger.class)//
+		      .req(WeeklyreportDao.class, MonthreportDao.class));
+
 		all.add(C(SqlReportBuilder.class) //
 		      .req(GraphDao.class, DailygraphDao.class, ReportDao.class, DailyreportDao.class, SqlMerger.class)//
 		      .req(WeeklyreportDao.class, MonthreportDao.class));
@@ -193,7 +194,8 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(DailyReportService.class, HourlyReportService.class, ServerConfigManager.class));
 
 		all.add(C(ReportService.class, ReportServiceImpl.class)//
-		      .req(HourlyReportService.class, DailyReportService.class, WeeklyReportService.class, MonthReportService.class)//
+		      .req(HourlyReportService.class, DailyReportService.class, WeeklyReportService.class,
+		            MonthReportService.class)//
 		      .req(WeeklyReportCache.class, MonthReportCache.class));
 
 		// model service
diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml
index 096bac199..e34560d42 100755
--- a/cat-home/src/main/resources/META-INF/plexus/components.xml
+++ b/cat-home/src/main/resources/META-INF/plexus/components.xml
@@ -78,6 +78,10 @@
 			<role>com.dianping.cat.report.task.database.DatabaseMerger</role>
 			<implementation>com.dianping.cat.report.task.database.DatabaseMerger</implementation>
 		</component>
+		<component>
+			<role>com.dianping.cat.report.task.matrix.MatrixMerger</role>
+			<implementation>com.dianping.cat.report.task.matrix.MatrixMerger</implementation>
+		</component>
 		<component>
 			<role>com.dianping.cat.report.task.sql.SqlMerger</role>
 			<implementation>com.dianping.cat.report.task.sql.SqlMerger</implementation>
@@ -207,8 +211,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.task.matrix.MatrixReportBuilder</role>
-			<implementation>com.dianping.cat.report.task.matrix.MatrixReportBuilder</implementation>
+			<role>com.dianping.cat.report.task.database.DatabaseReportBuilder</role>
+			<implementation>com.dianping.cat.report.task.database.DatabaseReportBuilder</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.home.dal.report.GraphDao</role>
@@ -223,7 +227,7 @@
 					<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.task.matrix.MatrixMerger</role>
+					<role>com.dianping.cat.report.task.database.DatabaseMerger</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.home.dal.report.WeeklyreportDao</role>
@@ -234,8 +238,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.task.database.DatabaseReportBuilder</role>
-			<implementation>com.dianping.cat.report.task.database.DatabaseReportBuilder</implementation>
+			<role>com.dianping.cat.report.task.matrix.MatrixReportBuilder</role>
+			<implementation>com.dianping.cat.report.task.matrix.MatrixReportBuilder</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.home.dal.report.GraphDao</role>
@@ -250,7 +254,7 @@
 					<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.task.database.DatabaseMerger</role>
+					<role>com.dianping.cat.report.task.matrix.MatrixMerger</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.home.dal.report.WeeklyreportDao</role>
-- 
GitLab