Merge branch 'master' of ssh://192.168.8.22:58422/cat

cat-consumer/src/main/java/com/dianping/cat/consumer/build/CatDatabaseConfigurator.java

@@ -11,8 +11,8 @@ final class CatDatabaseConfigurator extends AbstractJdbcResourceConfigurator {
    public List<Component> defineComponents() {
       List<Component> all = new ArrayList<Component>();
 
-      //all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
-      all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://127.0.0.1:3306/cat", "root", "", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
+      all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
+      //all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://127.0.0.1:3306/cat", "root", "", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
 
       defineSimpleTableProviderComponents(all, "cat", com.dainping.cat.consumer.dal.report._INDEX.getEntityClasses());
       defineDaoComponents(all, com.dainping.cat.consumer.dal.report._INDEX.getDaoClasses());

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

@@ -292,9 +292,9 @@
 				<statement-cache-size>1000</statement-cache-size>
 				<properties>
 					<driver>com.mysql.jdbc.Driver</driver>
-					<URL>jdbc:mysql://127.0.0.1:3306/cat</URL>
-					<user>root</user>
-					<password></password>
+					<URL>jdbc:mysql://192.168.7.43:3306/cat</URL>
+					<user>dpcom_cat</user>
+					<password>password</password>
 					<connectionProperties><![CDATA[useUnicode=true&autoReconnect=true]]></connectionProperties>
 				</properties>
 			</configuration>

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

@@ -11,10 +11,7 @@ import com.dianping.cat.consumer.problem.model.ProblemReportTest;
 import com.dianping.cat.consumer.transaction.FormatTest;
 import com.dianping.cat.consumer.transaction.GsonTest;
 import com.dianping.cat.consumer.transaction.NumberFormatTest;
-import com.dianping.cat.consumer.transaction.TransactionAnalyzerTest;
 import com.dianping.cat.consumer.transaction.TransactionReportFilterTest;
-import com.dianping.cat.consumer.transaction.TransactionReportMessageAnalyzerTest;
-import com.dianping.cat.consumer.transaction.TransactionReportTest;
 
 @RunWith(Suite.class)
 @SuiteClasses({
@@ -22,28 +19,28 @@ import com.dianping.cat.consumer.transaction.TransactionReportTest;
 /* .ip */
 IpReportTest.class,
 
-TransactionAnalyzerTest.class,
+//TransactionAnalyzerTest.class,
 
-TransactionReportMessageAnalyzerTest.class,
+//TransactionReportMessageAnalyzerTest.class,
 
-TransactionReportTest.class,
+//TransactionReportTest.class,
 
 // ManyAnalyzerTest.class,
 
-      // OneAnalyzerTwoDurationTest.class,
+// OneAnalyzerTwoDurationTest.class,
 
-      ProblemReportTest.class,
+ProblemReportTest.class,
 
-      FormatTest.class, GsonTest.class,
+FormatTest.class, GsonTest.class,
 
-      NumberFormatTest.class,
+NumberFormatTest.class,
 
-      MatrixReportFilterTest.class,
+MatrixReportFilterTest.class,
 
-      TransactionReportFilterTest.class,
+TransactionReportFilterTest.class,
 
-      /* cross analyzer */
-      ParseCrossInfoTest.class })
+/* cross analyzer */
+ParseCrossInfoTest.class })
 public class AllTests {
 
 }

cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionReportMessageAnalyzerTest.java

@@ -91,9 +91,6 @@ public class TransactionReportMessageAnalyzerTest extends ComponentTestCase {
 		assertEquals(1000.0, n2.getMax());
 		assertEquals(500.5, n2.getAvg());
 		assertEquals(500500.0, n2.getSum());
-
-		// System.out.println(new DefaultJsonBuilder().buildJson(report));
-		// System.out.println(report.toString());
 	}
 
 }

cat-home/src/main/resources/META-INF/dal/jdbc/alarm-dal.xml

@@ -43,7 +43,7 @@
 			<query name="find-all-alarm-rule" type="SELECT" multiple="true">
 				<statement><![CDATA[
 					SELECT <FIELDS/> 
-					FROM <TABLE/> 
+					FROM <TABLE/> ORDER BY <FIELD name='domain'/> ASC
 				]]></statement>
 			</query>
 			<query name="find-all-alarm-rule-by-template-id" type="SELECT"
@@ -52,7 +52,7 @@
 				<statement><![CDATA[
 					SELECT <FIELDS/> 
 					FROM <TABLE/> 
-					WHERE <FIELD name='template-id'/> = ${template-id} 
+					WHERE <FIELD name='template-id'/> = ${template-id} ORDER BY <FIELD name='domain'/> ASC
 				]]></statement>
 			</query>
 		</query-defs>
@@ -114,6 +114,7 @@
 				<statement><![CDATA[
 					SELECT <FIELDS/> 
 					FROM <TABLE/> 
+					ORDER BY <FIELD name='domain'/> ASC
 				]]></statement>
 			</query>
 			</query-defs>