update testcases

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager;
 import org.unidal.initialization.Module;
 import org.unidal.lookup.configuration.AbstractResourceConfigurator;
 import org.unidal.lookup.configuration.Component;
@@ -236,7 +237,8 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		final List<Component> all = new ArrayList<Component>();
 		final String ID = TopAnalyzer.ID;
 
-		all.add(C(MessageAnalyzer.class, ID, TopAnalyzer.class).is(PER_LOOKUP) //
+		all.add(C(MessageAnalyzer.class, ID, TopAnalyzer.class).is(PER_LOOKUP)
+		      //
 		      .req(ReportManager.class, ID).req(ServerConfigManager.class)
 		      .config(E("errorType").value("Error,RuntimeException,Exception")));
 		all.add(C(ReportManager.class, ID, DefaultReportManager.class) //
@@ -279,6 +281,10 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		all.add(C(ReportDelegate.class, ID, StorageDelegate.class).req(TaskManager.class, ServerConfigManager.class,
 		      StorageReportUpdater.class));
 
+		// database
+		all.add(C(JdbcDataSourceDescriptorManager.class) //
+		      .config(E("datasourceFile").value("/data/appdatas/cat/datasources.xml")));
+
 		return all;
 	}
 }

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

@@ -711,6 +711,13 @@
 				</requirement>
 			</requirements>
 		</component>
+		<component>
+			<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</role>
+			<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</implementation>
+			<configuration>
+				<datasourceFile>/data/appdatas/cat/datasources.xml</datasourceFile>
+			</configuration>
+		</component>
 		<component>
 			<role>org.unidal.initialization.Module</role>
 			<role-hint>cat-consumer</role-hint>

cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java

@@ -3,6 +3,7 @@ package com.dianping.cat.build;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager;
 import org.unidal.initialization.Module;
 import org.unidal.lookup.configuration.AbstractResourceConfigurator;
 import org.unidal.lookup.configuration.Component;
@@ -54,7 +55,6 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		all.add(C(MessageConsumer.class, RealtimeConsumer.class) //
 		      .req(MessageAnalyzerManager.class, ServerStatisticManager.class, BlackListManager.class));
 
-		all.add(C(ServerFilterConfigManager.class).req(ConfigDao.class, ContentFetcher.class));
 		all.add(C(ServerConfigManager.class).req(ServerFilterConfigManager.class));
 		all.add(C(HostinfoService.class).req(HostinfoDao.class, ServerConfigManager.class));
 		all.add(C(IpService.class));
@@ -62,6 +62,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		all.add(C(ServerStatisticManager.class));
 		all.add(C(DomainValidator.class));
 		all.add(C(ContentFetcher.class, DefaultContentFetcher.class));
+		all.add(C(ServerFilterConfigManager.class).req(ConfigDao.class, ContentFetcher.class));
 
 		all.add(C(PathBuilder.class, DefaultPathBuilder.class));
 
@@ -90,6 +91,10 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 
 		all.add(C(Module.class, CatCoreModule.ID, CatCoreModule.class));
 
+		// database
+		all.add(C(JdbcDataSourceDescriptorManager.class) //
+		      .config(E("datasourceFile").value("/data/appdatas/cat/datasources.xml")));
+
 		all.addAll(new CatCoreDatabaseConfigurator().defineComponents());
 		all.addAll(new CodecComponentConfigurator().defineComponents());
 		all.addAll(new StorageComponentConfigurator().defineComponents());

cat-core/src/main/java/com/dianping/cat/config/server/ServerFilterConfigManager.java

@@ -25,7 +25,7 @@ public class ServerFilterConfigManager implements Initializable {
 	protected ConfigDao m_configDao;
 
 	@Inject
-	private ContentFetcher m_fetcher;
+	protected ContentFetcher m_fetcher;
 
 	private ServerFilterConfig m_config;
 

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

@@ -15,22 +15,6 @@
 				</requirement>
 			</requirements>
 		</component>
-		<component>
-			<role>com.dianping.cat.config.content.ContentFetcher</role>
-			<implementation>com.dianping.cat.config.content.DefaultContentFetcher</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.config.server.ServerFilterConfigManager</role>
-			<implementation>com.dianping.cat.config.server.ServerFilterConfigManager</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.core.config.ConfigDao</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.config.content.ContentFetcher</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>com.dianping.cat.config.server.ServerConfigManager</role>
 			<implementation>com.dianping.cat.config.server.ServerConfigManager</implementation>
@@ -73,6 +57,22 @@
 			<role>com.dianping.cat.report.DomainValidator</role>
 			<implementation>com.dianping.cat.report.DomainValidator</implementation>
 		</component>
+		<component>
+			<role>com.dianping.cat.config.content.ContentFetcher</role>
+			<implementation>com.dianping.cat.config.content.DefaultContentFetcher</implementation>
+		</component>
+		<component>
+			<role>com.dianping.cat.config.server.ServerFilterConfigManager</role>
+			<implementation>com.dianping.cat.config.server.ServerFilterConfigManager</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.core.config.ConfigDao</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.config.content.ContentFetcher</role>
+				</requirement>
+			</requirements>
+		</component>
 		<component>
 			<role>com.dianping.cat.message.PathBuilder</role>
 			<implementation>com.dianping.cat.message.DefaultPathBuilder</implementation>
@@ -192,6 +192,13 @@
 			<role-hint>cat-core</role-hint>
 			<implementation>com.dianping.cat.CatCoreModule</implementation>
 		</component>
+		<component>
+			<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</role>
+			<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</implementation>
+			<configuration>
+				<datasourceFile>/data/appdatas/cat/datasources.xml</datasourceFile>
+			</configuration>
+		</component>
 		<component>
 			<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
 			<role-hint>config</role-hint>

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

@@ -9,6 +9,7 @@ import com.dianping.cat.analysis.DefaultMessageAnalyzerManagerTest;
 import com.dianping.cat.analysis.PeriodTaskTest;
 import com.dianping.cat.message.codec.HtmlMessageCodecTest;
 import com.dianping.cat.message.codec.WaterfallMessageCodecTest;
+import com.dianping.cat.server.ServerConfigManagerTest;
 import com.dianping.cat.service.DefaultReportManagerTest;
 import com.dianping.cat.service.ModelPeriodTest;
 import com.dianping.cat.service.ModelRequestTest;
@@ -43,6 +44,8 @@ ModelResponseTest.class,
 
 PeriodTaskTest.class,
 
+ServerConfigManagerTest.class,
+
 AbstractMessageAnalyzerTest.class,
 
 DefaultMessageAnalyzerManagerTest.class,

cat-home/src/test/java/com/dianping/cat/report/service/ServerConfigManagerTest.java → cat-core/src/test/java/com/dianping/cat/server/ServerConfigManagerTest.java

-package com.dianping.cat.report.service;
+package com.dianping.cat.server;
 
 import java.io.File;
 
@@ -14,7 +14,7 @@ public class ServerConfigManagerTest extends ComponentTestCase {
 	@Test
 	public void test() throws Exception {
 		ServerConfigManager manager = lookup(ServerConfigManager.class);
-		String path = System.getProperty("user.dir") + "/src/test/resources/com/dianping/cat/report/service/server.xml";
+		String path = System.getProperty("user.dir") + "/src/test/resources/com/dianping/cat/server.xml";
 		File file = new File(path);
 
 		manager.initialize(file);
@@ -35,9 +35,6 @@ public class ServerConfigManagerTest extends ComponentTestCase {
 		Assert.assertEquals(false, manager.isJobMachine());
 		Assert.assertEquals(false, manager.isLocalMode());
 		Assert.assertEquals(true, manager.isRpcServer("PigeonService"));
-		Assert.assertEquals(false, manager.validateDomain("All"));
-
-		Assert.assertEquals(true, manager.discardTransaction("Service", "piegonService:heartTaskService:heartBeat"));
 
 		manager.initialize(null);
 

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

@@ -27,7 +27,6 @@ import com.dianping.cat.report.page.transaction.PayloadTest;
 import com.dianping.cat.report.page.transaction.TransactionGraphDataTest;
 import com.dianping.cat.report.page.transaction.TransactionReportFilterTest;
 import com.dianping.cat.report.page.web.WebReportConvertorTest;
-import com.dianping.cat.report.service.ServerConfigManagerTest;
 import com.dianping.cat.report.task.TaskConsumerTest;
 import com.dianping.cat.report.task.TaskHelperTest;
 import com.dianping.cat.report.task.event.EventDailyGraphMergerTest;
@@ -143,8 +142,6 @@ MetricIdAndRuleMappingTest.class,
 
 ExtractDataTest.class,
 
-ServerConfigManagerTest.class,
-
 JudgeTimeTest.class })
 public class AllTests {
 

cat-home/src/test/resources/com/dianping/cat/report/page/service/service.xml

-<?xml version="1.0" encoding="utf-8"?>
-<service-report startTime="2012-05-16 16:00:00" domain="All"
-	endTime="2012-05-16 16:59:59">
-	<domain id="Cat">
-	    <totalCount>100</totalCount>
-	    <failureCount>2</failureCount>
-	    <failurePercent>0.02</failurePercent>
-	    <sum>2000</sum>
-	    <avg>20</avg>
-	    <qps>1</qps>
-	</domain>
-	<domain>
-	</domain>
-</service-report>
\ No newline at end of file