diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java index 8ef11b7100295488b47cc53e8217b5edef4c4d8e..1becb33758dcd4c91a6f368a5ec599ce0e3ba33b 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java +++ b/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 all = new ArrayList(); 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; } } diff --git a/cat-consumer/src/main/resources/META-INF/plexus/components.xml b/cat-consumer/src/main/resources/META-INF/plexus/components.xml index 01f58444285a205b6a465da19ab1cda7c75e9389..8b5942bbbea89e2a98203888ce963c1b070ed5a3 100644 --- a/cat-consumer/src/main/resources/META-INF/plexus/components.xml +++ b/cat-consumer/src/main/resources/META-INF/plexus/components.xml @@ -711,6 +711,13 @@ + + org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager + org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager + + /data/appdatas/cat/datasources.xml + + org.unidal.initialization.Module cat-consumer diff --git a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index bd5751157056e8c7b41e1d0662725de471097430..f9d55d857761c42153ecd302cbcd7af21da11c81 100644 --- a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/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()); diff --git a/cat-core/src/main/java/com/dianping/cat/config/server/ServerFilterConfigManager.java b/cat-core/src/main/java/com/dianping/cat/config/server/ServerFilterConfigManager.java index ddb17609a5c8a22feefa35030237446d58be0ff3..02e3a5b5e6f27f09a0c6f0450dcb386fc41afdb2 100644 --- a/cat-core/src/main/java/com/dianping/cat/config/server/ServerFilterConfigManager.java +++ b/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; diff --git a/cat-core/src/main/resources/META-INF/plexus/components.xml b/cat-core/src/main/resources/META-INF/plexus/components.xml index ca08a02078fce8bcaa39ba8d034c12b92bc2c7f5..09d7be9830d843ebca42a76b36792cb9063038c8 100644 --- a/cat-core/src/main/resources/META-INF/plexus/components.xml +++ b/cat-core/src/main/resources/META-INF/plexus/components.xml @@ -15,22 +15,6 @@ - - com.dianping.cat.config.content.ContentFetcher - com.dianping.cat.config.content.DefaultContentFetcher - - - com.dianping.cat.config.server.ServerFilterConfigManager - com.dianping.cat.config.server.ServerFilterConfigManager - - - com.dianping.cat.core.config.ConfigDao - - - com.dianping.cat.config.content.ContentFetcher - - - com.dianping.cat.config.server.ServerConfigManager com.dianping.cat.config.server.ServerConfigManager @@ -73,6 +57,22 @@ com.dianping.cat.report.DomainValidator com.dianping.cat.report.DomainValidator + + com.dianping.cat.config.content.ContentFetcher + com.dianping.cat.config.content.DefaultContentFetcher + + + com.dianping.cat.config.server.ServerFilterConfigManager + com.dianping.cat.config.server.ServerFilterConfigManager + + + com.dianping.cat.core.config.ConfigDao + + + com.dianping.cat.config.content.ContentFetcher + + + com.dianping.cat.message.PathBuilder com.dianping.cat.message.DefaultPathBuilder @@ -192,6 +192,13 @@ cat-core com.dianping.cat.CatCoreModule + + org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager + org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager + + /data/appdatas/cat/datasources.xml + + org.unidal.dal.jdbc.mapping.TableProvider config diff --git a/cat-core/src/test/java/com/dianping/cat/AllTests.java b/cat-core/src/test/java/com/dianping/cat/AllTests.java index 27eb3bda5afce3eba793c852095434d3d4aef958..3208a2558059d299529e17b6cd68fddd90bf8b4e 100644 --- a/cat-core/src/test/java/com/dianping/cat/AllTests.java +++ b/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, diff --git a/cat-home/src/test/java/com/dianping/cat/report/service/ServerConfigManagerTest.java b/cat-core/src/test/java/com/dianping/cat/server/ServerConfigManagerTest.java similarity index 86% rename from cat-home/src/test/java/com/dianping/cat/report/service/ServerConfigManagerTest.java rename to cat-core/src/test/java/com/dianping/cat/server/ServerConfigManagerTest.java index 79773e226a462672ef1e7b95acf5026a649e56f0..6767e8251abb89ee70133f01a9d26f6050cc62d9 100644 --- a/cat-home/src/test/java/com/dianping/cat/report/service/ServerConfigManagerTest.java +++ b/cat-core/src/test/java/com/dianping/cat/server/ServerConfigManagerTest.java @@ -1,4 +1,4 @@ -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); diff --git a/cat-home/src/test/java/com/dianping/cat/AllTests.java b/cat-home/src/test/java/com/dianping/cat/AllTests.java index 617670194fb4780d48c1ec49af4e812cdaf462bf..e48c54ed38e9e4e853e955dec889b1b3bd63d75e 100755 --- a/cat-home/src/test/java/com/dianping/cat/AllTests.java +++ b/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 { diff --git a/cat-home/src/test/resources/com/dianping/cat/report/page/service/service.xml b/cat-home/src/test/resources/com/dianping/cat/report/page/service/service.xml deleted file mode 100644 index 86e42c8732a54bc289a4465fea145d3db0b9e6b2..0000000000000000000000000000000000000000 --- a/cat-home/src/test/resources/com/dianping/cat/report/page/service/service.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 100 - 2 - 0.02 - 2000 - 20 - 1 - - - - \ No newline at end of file