modify the ui

cat-home/src/main/webapp/jsp/report/utilization/detail.jsp

@@ -19,7 +19,8 @@
 								<th>Web应用</th>
 								<th>机器数</th>
 								<th>访问量<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】的URL访问总量"></i></th>
-								<th>QPS<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】单台机器URL每秒的访问最大量"></i></th>
+								<th>集群QPS<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】单台机器URL每秒的访问最大量"></i></th>
+								<th>单机QPS<i tips="" data-trigger="hover" class="icon-question-sign" data-toggle="popover" data-placement="left"  data-content="一段时间【小时、天、周、月】单台机器URL每秒的访问最大量"></i></th>
 								<th>错误量</th>
 								<th>错误量%</th>
 								<th>响应时间(ms)</th>
@@ -36,6 +37,7 @@
 									<td style="text-align:right">${item.machineNumber}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.count,'###0')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.maxQps,'###0')}</td>
+									<td style="text-align:right">${w:format(item.applicationStates.URL.maxQps/item.machineNumber,'###0')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.failureCount,'###0')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.failurePercent,'###0%')}</td>
 									<td style="text-align:right">${w:format(item.applicationStates.URL.avg,'#0.0')}</td>

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

@@ -8,7 +8,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.dianping.cat.report.baseline.BaselineCreatorTest;
 import com.dianping.cat.report.graph.ValueTranslaterTest;
 import com.dianping.cat.report.page.cross.CMDBTest;
 import com.dianping.cat.report.page.cross.CrossReportMergerTest;
@@ -33,6 +32,7 @@ import com.dianping.cat.report.task.event.EventDailyGraphMergerTest;
 import com.dianping.cat.report.task.event.EventGraphCreatorTest;
 import com.dianping.cat.report.task.event.HistoryEventMergerTest;
 import com.dianping.cat.report.task.heavy.HeavyReportBuilderTest;
+import com.dianping.cat.report.task.metric.BaselineCreatorTest;
 import com.dianping.cat.report.task.problem.ProblemCreateGraphDataTest;
 import com.dianping.cat.report.task.problem.ProblemDailyGraphMergerTest;
 import com.dianping.cat.report.task.problem.ProblemDailyGraphTest;

cat-home/src/test/java/com/dianping/cat/report/baseline/BaselineCreatorTest.java → cat-home/src/test/java/com/dianping/cat/report/task/metric/BaselineCreatorTest.java

-package com.dianping.cat.report.baseline;
+package com.dianping.cat.report.task.metric;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,6 +9,7 @@ import java.util.Set;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.dianping.cat.report.baseline.BaselineCreator;
 import com.dianping.cat.report.baseline.impl.DefaultBaselineCreator;
 
 public class BaselineCreatorTest {

cat-home/src/test/resources/com/dianping/cat/demo/client.xml

-<config mode="client" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="config.xsd">
-	<domain id="Cat-demo" enabled="true"/>
-	<servers>
-		<server ip="192.168.7.43" port="2280" />
-	</servers>
-</config>
\ No newline at end of file