merge the code

cat-client/src/main/resources/com/dianping/cat/status/model/status.xsd

-<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
    <xs:element name="status" type="StatusType"/>
    <xs:complexType name="StatusType">
       <xs:sequence>

cat-consumer/src/main/java/com/dianping/cat/consumer/state/StateDelegate.java

@@ -35,6 +35,7 @@ public class StateDelegate implements ReportDelegate<StateReport> {
 		Date startTime = report.getStartTime();
 		String domain = report.getDomain();
 
+		m_taskManager.createTask(startTime, domain, Constants.REPORT_ABTEST, TaskProlicy.HOULY);
 		m_taskManager.createTask(startTime, domain, Constants.REPORT_SERVICE, TaskProlicy.ALL);
 		m_taskManager.createTask(startTime, domain, Constants.REPORT_BUG, TaskProlicy.ALL);
 		m_taskManager.createTask(startTime, domain, Constants.REPORT_HEAVY, TaskProlicy.ALL);

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

@@ -21,5 +21,5 @@ public class Constants {
 
 	public static final String REPORT_HEAVY = "heavy";
 	
-	public static final String ABTEST = "abtest";
+	public static final String REPORT_ABTEST = "abtest";
 }

cat-home/pom.xml

@@ -185,7 +185,8 @@
 								${basedir}/src/main/resources/META-INF/dal/model/service-report-manifest.xml,
 								${basedir}/src/main/resources/META-INF/dal/model/heavy-report-manifest.xml,
 								${basedir}/src/main/resources/META-INF/dal/model/utilization-report-manifest.xml,
-								${basedir}/src/main/resources/META-INF/dal/model/utilization-config-manifest.xml,</manifest>
+								${basedir}/src/main/resources/META-INF/dal/model/utilization-config-manifest.xml,
+								${basedir}/src/main/resources/META-INF/dal/model/abtest-report-manifest.xml,</manifest>
 						</configuration>
 					</execution>
 					<execution>
@@ -195,11 +196,11 @@
 							<goal>dal-jdbc</goal>
 						</goals>
 						<configuration>
-							<manifest><![CDATA[${basedir}/src/main/resources/META-INF/dal/jdbc/report-manifest.xml,
+							<manifest><![CDATA[
+					${basedir}/src/main/resources/META-INF/dal/jdbc/report-manifest.xml,
                      ${basedir}/src/main/resources/META-INF/dal/jdbc/alarm-manifest.xml,
-                     ${basedir}/src/main/resources/META-INF/dal/jdbc/user-manifest.xml,]]>  <![CDATA[${basedir}/src/main/resources/META-INF/dal/jdbc/report-manifest.xml,
-					 ${basedir}/src/main/resources/META-INF/dal/jdbc/alarm-manifest.xml,
-					 ${basedir}/src/main/resources/META-INF/dal/jdbc/abtest-manifest.xml,]]></manifest>
+                     ${basedir}/src/main/resources/META-INF/dal/jdbc/abtest-manifest.xml,
+                     ${basedir}/src/main/resources/META-INF/dal/jdbc/user-manifest.xml,]]></manifest>
 						</configuration>
 					</execution>
 				</executions>

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

@@ -169,7 +169,7 @@ public class ReportFacade implements LogEnabled, Initializable {
 		m_reportBuilders.put(Constants.REPORT_SERVICE, m_serviceReportBuilder);
 		m_reportBuilders.put(Constants.REPORT_HEAVY, m_heavyReportBuilder);
 		m_reportBuilders.put(Constants.REPORT_UTILIZATION, m_utilizationReportBuilder);
-		m_reportBuilders.put(Constants.ABTEST, m_abtestReportBuilder);
+		m_reportBuilders.put(Constants.REPORT_ABTEST, m_abtestReportBuilder);
 	}
 
 }

cat-home/src/main/java/com/dianping/cat/system/page/abtest/Handler.java

@@ -272,6 +272,12 @@ public class Handler implements PageHandler<Context>, LogEnabled, Initializable
 		case MODEL:
 			renderModel(model, payload);
 			break;
+		case ABTEST_CACULATOR:
+		case AJAX_ADDGROUPSTRATEGY:
+		case AJAX_CREATE:
+		case AJAX_DETAIL:
+		case AJAX_PARSEGROUPSTRATEGY:
+			break;
 		}
 
 		model.setAction(action);

cat-home/src/main/webapp/WEB-INF/tags/body.tag

@@ -52,7 +52,7 @@
         </div>
       </div>
     </div>
-	<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog"
+	<div id="loginModal" class="modal hide fade" tabindex="-1" role="dialog"
 		aria-labelledby="myModalLabel" aria-hidden="true" style="width:380px">
 		<form class="form-horizontal" name="login" method="post" action="/cat/s/login">
 			<div class="modal-header">
@@ -126,7 +126,7 @@
 				loginInfo.innerHTML ='<a href="/cat/s/login?op=logout">'+name +'&nbsp;登出</a>';
 			}else{
 				var loginInfo=document.getElementById('loginInfo');
-				loginInfo.innerHTML ='<a href="#myModal" data-toggle="modal">登陆</a>';
+				loginInfo.innerHTML ='<a href="#loginModal" data-toggle="modal">登陆</a>';
 			}
 		});
 	</script>

cat-home/src/main/webapp/css/body.css

@@ -253,4 +253,11 @@ select{
 }
 ul, ol{
 	margin:0 0 10px 25px;
+}
+
+#loginModal .form-horizontal .control-label{
+	width:50px;
+}
+#loginModal .form-horizontal .controls{
+	margin-left:70px;
 }
\ No newline at end of file