modify the cat

cat-consumer/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0</version>
+		<version>0.3.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-consumer</artifactId>

cat-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0</version>
+		<version>0.3.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-core</artifactId>

cat-hadoop/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0</version>
+		<version>0.3.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-hadoop</artifactId>

cat-home/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0</version>
+		<version>0.3.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-home</artifactId>

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

@@ -22,7 +22,7 @@ public class EventMerger implements ReportMerger<EventReport> {
 	@Override
 	public EventReport merge(String reportDomain, List<Report> reports) {
 		EventReport eventReport;
-		EventReportMerger merger = new EventReportMerger(new EventReport(reportDomain));
+		EventReportMerger merger = new HistoryEventReportMerger(new EventReport(reportDomain));
 
 		for (Report report : reports) {
 			String xml = report.getContent();
@@ -45,7 +45,7 @@ public class EventMerger implements ReportMerger<EventReport> {
 	@Override
 	public String mergeAll(String reportDomain, List<Report> reports) {
 		EventReport eventReport = merge(reportDomain, reports);
-		EventReportMerger merger = new EventReportMerger(new EventReport(reportDomain));
+		EventReportMerger merger = new HistoryEventReportMerger(new EventReport(reportDomain));
 		EventReport eventReport2 = merge(reportDomain, reports);
 		com.dianping.cat.consumer.event.model.entity.Machine allMachines = merger.mergesForAllMachine(eventReport2);
 		eventReport.addMachine(allMachines);

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

+package com.dianping.cat.report.task;
+
+import com.dianping.cat.consumer.event.model.entity.EventReport;
+import com.dianping.cat.consumer.event.model.entity.Range;
+import com.dianping.cat.report.page.model.event.EventReportMerger;
+
+public class HistoryEventReportMerger extends EventReportMerger{
+
+	public HistoryEventReportMerger(EventReport eventReport) {
+	   super(eventReport);
+   }
+
+	@Override
+   public void visitRange(Range range) {
+	   //super.visitRange(range);
+   }
+
+	@Override
+   protected void visitRangeChildren(Range old, Range range) {
+	   //super.visitRangeChildren(old, range);
+   }
+}

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

+package com.dianping.cat.report.task;
+
+import com.dianping.cat.consumer.transaction.model.entity.AllDuration;
+import com.dianping.cat.consumer.transaction.model.entity.Duration;
+import com.dianping.cat.consumer.transaction.model.entity.Range;
+import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
+import com.dianping.cat.report.page.model.transaction.TransactionReportMerger;
+
+public class HistoryTransactionReportMerger extends TransactionReportMerger {
+
+	public HistoryTransactionReportMerger(TransactionReport transactionReport) {
+	   super(transactionReport);
+   }
+
+	@Override
+   public void visitAllDuration(AllDuration allDuration) {
+		//super.visitAllDuration(allDuration);
+   }
+
+	@Override
+   public void visitDuration(Duration duration) {
+		//super.visitDuration(duration);
+   }
+
+	@Override
+   public void visitRange(Range range) {
+	  // super.visitRange(range);
+   }
+	
+}

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

@@ -21,7 +21,7 @@ public class TransactionMerger implements ReportMerger<TransactionReport> {
 
 	public String mergeAll(String reportDomain, List<Report> reports) {
 		TransactionReport transactionReport = merge(reportDomain, reports);
-		TransactionReportMerger merger = new TransactionReportMerger(new TransactionReport(reportDomain));
+		TransactionReportMerger merger = new HistoryTransactionReportMerger(new TransactionReport(reportDomain));
 		TransactionReport transactionReport2 = merge(reportDomain, reports);
 		com.dianping.cat.consumer.transaction.model.entity.Machine allMachines = merger.mergesForAllMachine(transactionReport2);
 		transactionReport.addMachine(allMachines);
@@ -32,7 +32,7 @@ public class TransactionMerger implements ReportMerger<TransactionReport> {
 
 	public TransactionReport merge(String reportDomain, List<Report> reports) {
 		TransactionReport transactionReport;
-		TransactionReportMerger merger = new TransactionReportMerger(new TransactionReport(reportDomain));
+		TransactionReportMerger merger = new HistoryTransactionReportMerger(new TransactionReport(reportDomain));
 
 		for (Report report : reports) {
 			String xml = report.getContent();

cat-job/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0</version>
+		<version>0.3.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-job</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.cat</groupId>
 	<artifactId>parent</artifactId>
-	<version>0.3.0</version>
+	<version>0.3.1</version>
 	<name>CAT</name>
 	<packaging>pom</packaging>
 	<modules>