From 1511f4474c901b311a20f201f5b497f5c1a9d63e Mon Sep 17 00:00:00 2001
From: "yanchun.yang" <yanchun.yang@dianping.com>
Date: Thu, 9 Aug 2012 09:48:27 +0800
Subject: [PATCH] add report builder

---
 .../cat/build/ComponentsConfigurator.java     |  3 ++-
 .../cat/report/task/ReportFacade.java         |  5 +++++
 .../resources/META-INF/plexus/components.xml  | 21 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

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 ae51739d0..987a8182a 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
@@ -25,6 +25,7 @@ import com.dianping.cat.report.task.event.EventReportBuilder;
 import com.dianping.cat.report.task.heartbeat.HeartbeatGraphCreator;
 import com.dianping.cat.report.task.heartbeat.HeartbeatMerger;
 import com.dianping.cat.report.task.heartbeat.HeartbeatReportBuilder;
+import com.dianping.cat.report.task.matrix.MatrixReportBuilder;
 import com.dianping.cat.report.task.problem.ProblemGraphCreator;
 import com.dianping.cat.report.task.problem.ProblemMerger;
 import com.dianping.cat.report.task.problem.ProblemReportBuilder;
@@ -83,7 +84,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 
 		all.add(C(ReportFacade.class)//
 		      .req(TransactionReportBuilder.class, EventReportBuilder.class, ProblemReportBuilder.class,
-		            HeartbeatReportBuilder.class,TaskDao.class));
+		            HeartbeatReportBuilder.class,MatrixReportBuilder.class,TaskDao.class));
 
 		all.addAll(new ServiceComponentConfigurator().defineComponents());
 
diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/ReportFacade.java b/cat-home/src/main/java/com/dianping/cat/report/task/ReportFacade.java
index 3e594b048..8dab70a15 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/task/ReportFacade.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/task/ReportFacade.java
@@ -15,6 +15,7 @@ import com.dianping.cat.hadoop.dal.TaskDao;
 import com.dianping.cat.hadoop.dal.TaskEntity;
 import com.dianping.cat.report.task.event.EventReportBuilder;
 import com.dianping.cat.report.task.heartbeat.HeartbeatReportBuilder;
+import com.dianping.cat.report.task.matrix.MatrixReportBuilder;
 import com.dianping.cat.report.task.problem.ProblemReportBuilder;
 import com.dianping.cat.report.task.transaction.TransactionReportBuilder;
 import com.site.lookup.annotation.Inject;
@@ -36,6 +37,9 @@ public class ReportFacade implements LogEnabled, Initializable {
 
 	@Inject
 	private TransactionReportBuilder m_tansactionBuilder;
+	
+	@Inject
+	private MatrixReportBuilder m_matrixReportBuilder;
 
 	@Inject
 	private TaskDao m_taskDao;
@@ -83,6 +87,7 @@ public class ReportFacade implements LogEnabled, Initializable {
 		m_reportBuilders.put("event", m_eventBuilder);
 		m_reportBuilders.put("heartbeat", m_heartbeatBuilder);
 		m_reportBuilders.put("transaction", m_tansactionBuilder);
+		m_reportBuilders.put("matrix", m_matrixReportBuilder);
 	}
 
 	public boolean redoTask(int taskID) {
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 3ddfb4d35..57fb08feb 100755
--- a/cat-home/src/main/resources/META-INF/plexus/components.xml
+++ b/cat-home/src/main/resources/META-INF/plexus/components.xml
@@ -185,6 +185,9 @@
 				<requirement>
 					<role>com.dianping.cat.report.task.heartbeat.HeartbeatReportBuilder</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.report.task.matrix.MatrixReportBuilder</role>
+				</requirement>
 				<requirement>
 					<role>com.dianping.cat.hadoop.dal.TaskDao</role>
 				</requirement>
@@ -1164,6 +1167,9 @@
 				<requirement>
 					<role>com.dianping.cat.report.task.transaction.TransactionReportBuilder</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.report.task.matrix.MatrixReportBuilder</role>
+				</requirement>
 				<requirement>
 					<role>com.dianping.cat.hadoop.dal.TaskDao</role>
 				</requirement>
@@ -1273,6 +1279,21 @@
 			<role>com.dianping.cat.report.task.transaction.TransactionGraphCreator</role>
 			<implementation>com.dianping.cat.report.task.transaction.TransactionGraphCreator</implementation>
 		</component>
+		<component>
+			<role>com.dianping.cat.report.task.matrix.MatrixReportBuilder</role>
+			<implementation>com.dianping.cat.report.task.matrix.MatrixReportBuilder</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.hadoop.dal.DailyreportDao</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.hadoop.dal.GraphDao</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.hadoop.dal.ReportDao</role>
+				</requirement>
+			</requirements>
+		</component>
 		<component>
 			<role>com.dianping.cat.hadoop.dal.TaskDao</role>
 			<implementation>com.dianping.cat.hadoop.dal.TaskDao</implementation>
-- 
GitLab