Merge branch 'biz' of http://code.dianpingoa.com/arch/cat into biz

cat-core/src/main/java/com/dianping/cat/ServerConfigManager.java

@@ -38,6 +38,17 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 
 	private Set<String> m_unusedNames = new HashSet<String>();
 
+	public boolean discardTransaction(Transaction t) {
+		// pigeon default heartbeat is no use
+		String type = t.getType();
+		String name = t.getName();
+
+		if (m_unusedTypes.contains(type) && m_unusedNames.contains(name)) {
+			return true;
+		}
+		return false;
+	}
+
 	@Override
 	public void enableLogging(Logger logger) {
 		m_logger = logger;
@@ -313,17 +324,6 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		return "PigeonService".equals(type) || "Service".equals(type);
 	}
 
-	public boolean discardTransaction(Transaction t) {
-		// pigeon default heartbeat is no use
-		String type = t.getType();
-		String name = t.getName();
-
-		if (m_unusedTypes.contains(type) && m_unusedNames.contains(name)) {
-			return true;
-		}
-		return false;
-	}
-
 	private long toLong(String str, long defaultValue) {
 		long value = 0;
 		int len = str == null ? 0 : str.length();
@@ -351,8 +351,4 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		return !domain.equals("PhoenixAgent") && !domain.equals(Constants.FRONT_END);
 	}
 	
-	public String getDefaultProduct(){
-		return "TuanGou";
-	}
-
 }

cat-core/src/test/java/com/dianping/cat/consumer/AllTests.java

-package com.dianping.cat.consumer;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({
-
-// add test classes here
-
-})
-public class AllTests {
-
-}

cat-core/src/test/java/com/dianping/cat/core/AllTests.java

-package com.dianping.cat.core;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({
-
-// add test classes here
-
-})
-public class AllTests {
-
-}

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

@@ -13,7 +13,6 @@ 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.ServerConfigManager;
 import com.dianping.cat.consumer.advanced.ProductLineConfigManager;
 import com.dianping.cat.helper.TimeUtil;
 import com.dianping.cat.report.ReportPage;
@@ -34,9 +33,6 @@ public class Handler implements PageHandler<Context> {
 	@Inject
 	private GraphCreator m_graphCreator;
 
-	@Inject
-	private ServerConfigManager m_serverConfigManager;
-
 	@Override
 	@PayloadMeta(Payload.class)
 	@InboundActionMeta(name = "metric")
@@ -48,15 +44,14 @@ public class Handler implements PageHandler<Context> {
 	public void handleOutbound(Context ctx) throws ServletException, IOException {
 		Model model = new Model(ctx);
 		Payload payload = ctx.getPayload();
-		Action action = payload.getAction();
-
 		normalize(model, payload);
+
 		long date = payload.getDate();
 		int timeRange = payload.getTimeRange();
 		Date start = new Date(date - (timeRange - 1) * TimeUtil.ONE_HOUR);
 		Date end = new Date(date + TimeUtil.ONE_HOUR);
 
-		switch (action) {
+		switch (payload.getAction()) {
 		case METRIC:
 			Map<String, LineChart> charts = m_graphCreator.buildChartsByProductLine(payload.getProduct(), start, end,
 			      payload.getTest());
@@ -75,12 +70,12 @@ public class Handler implements PageHandler<Context> {
 
 	private void normalize(Model model, Payload payload) {
 		model.setPage(ReportPage.METRIC);
-		m_normalizePayload.normalize(model, payload);
-
 		String poduct = payload.getProduct();
+		
 		if (poduct == null || poduct.length() == 0) {
-			payload.setProduct(m_serverConfigManager.getDefaultProduct());
+			payload.setAction(Action.DASHBOARD.getName());
 		}
+		m_normalizePayload.normalize(model, payload);
 		int timeRange = payload.getTimeRange();
 		Date startTime = new Date(payload.getDate() - (timeRange - 1) * TimeUtil.ONE_HOUR);
 		Date endTime = new Date(payload.getDate() + TimeUtil.ONE_HOUR - 1);

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

@@ -2854,9 +2854,6 @@
 				<requirement>
 					<role>com.dianping.cat.report.page.metric.chart.GraphCreator</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.ServerConfigManager</role>
-				</requirement>
 			</requirements>
 		</component>
 		<component>

cat-home/src/main/webapp/jsp/report/metric/metric.jsp

@@ -54,6 +54,7 @@
 			</th>
 		</tr>
 	</table>
+	<div class="row-fluid" style="margin-top:2px;height:30px;"></div>
       <div class="row-fluid">
         <div class="span2">
           <div class="well sidebar-nav">

cat-home/src/test/java/com/dianping/cat/AllTests.java

@@ -107,8 +107,11 @@ ServiceReportMergerTest.class,
 
 /* abtest */
 GsonBuilderManagerTest.class,
+
 GroupStrategyParserTest.class,
+
 TrafficFilterTest.class,
+
 HeavyReportBuilderTest.class })
 public class AllTests {
 }