Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 738ced1b 编写于 作者: F Frankie Wu
浏览文件
操作

fix jdk8 issues

上级 b946495c
隐藏空白更改
内联 并排
Showing with 88 addition and 257 deletion
cat-client/pom.xml
浏览文件 @ 738ced1b
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.dianping.cat</groupId>
<artifactId>parent</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cat-client</artifactId>
......
cat-consumer/pom.xml
浏览文件 @ 738ced1b
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.dianping.cat</groupId>
<artifactId>parent</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cat-consumer</artifactId>
......
cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java
浏览文件 @ 738ced1b
......@@ -4,9 +4,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager;
import org.unidal.dal.jdbc.configuration.AbstractJdbcResourceConfigurator;
import org.unidal.initialization.Module;
import org.unidal.lookup.configuration.AbstractResourceConfigurator;
import org.unidal.lookup.configuration.Component;
import com.dianping.cat.analysis.MessageAnalyzer;
......@@ -64,7 +63,7 @@ import com.dianping.cat.service.ProjectService;
import com.dianping.cat.statistic.ServerStatisticManager;
import com.dianping.cat.task.TaskManager;
public class ComponentsConfigurator extends AbstractResourceConfigurator {
public class ComponentsConfigurator extends AbstractJdbcResourceConfigurator {
public static void main(String[] args) {
generatePlexusComponentsXmlFile(new ComponentsConfigurator());
}
......@@ -286,8 +285,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
ServerFilterConfigManager.class, StorageReportUpdater.class));
// database
all.add(C(JdbcDataSourceDescriptorManager.class) //
.config(E("datasourceFile").value("/data/appdatas/cat/datasources.xml")));
all.add(defineJdbcDataSourceConfigurationManagerComponent("/data/appdatas/cat/datasources.xml"));
return all;
}
......
cat-consumer/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ 738ced1b
......@@ -750,8 +750,8 @@
</requirements>
</component>
<component>
<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</role>
<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</implementation>
<role>org.unidal.dal.jdbc.datasource.DataSourceProvider</role>
<implementation>org.unidal.dal.jdbc.datasource.DefaultDataSourceProvider</implementation>
<configuration>
<datasourceFile>/data/appdatas/cat/datasources.xml</datasourceFile>
</configuration>
......@@ -778,7 +778,6 @@
<role-hint>business-report</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>business-report</logical-table-name>
<physical-table-name>businessReport</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......
cat-core/pom.xml
浏览文件 @ 738ced1b
......@@ -3,7 +3,7 @@
<parent>
<groupId>com.dianping.cat</groupId>
<artifactId>parent</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cat-core</artifactId>
......
cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
浏览文件 @ 738ced1b
......@@ -3,9 +3,8 @@ package com.dianping.cat.build;
import java.util.ArrayList;
import java.util.List;
import org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager;
import org.unidal.dal.jdbc.configuration.AbstractJdbcResourceConfigurator;
import org.unidal.initialization.Module;
import org.unidal.lookup.configuration.AbstractResourceConfigurator;
import org.unidal.lookup.configuration.Component;
import com.dianping.cat.CatCoreModule;
......@@ -46,7 +45,7 @@ import com.dianping.cat.service.IpService;
import com.dianping.cat.statistic.ServerStatisticManager;
import com.dianping.cat.task.TaskManager;
public class ComponentsConfigurator extends AbstractResourceConfigurator {
public class ComponentsConfigurator extends AbstractJdbcResourceConfigurator {
public static void main(String[] args) {
generatePlexusComponentsXmlFile(new ComponentsConfigurator());
}
......@@ -99,8 +98,7 @@ 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.add(defineJdbcDataSourceConfigurationManagerComponent("/data/appdatas/cat/datasources.xml"));
all.addAll(new CatCoreDatabaseConfigurator().defineComponents());
all.addAll(new CodecComponentConfigurator().defineComponents());
......
cat-core/src/main/java/com/dianping/cat/config/app/AppCommandTableProvider.java
浏览文件 @ 738ced1b
......@@ -8,36 +8,27 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import com.dianping.cat.app.AppCommandData;
public class AppCommandTableProvider implements TableProvider {
private String m_logicalTableName = "app-command-data";
private String m_physicalTableName = "app_command_data";
private String m_dataSourceName = "app";
@Override
public String getDataSourceName(Map<String, Object> hints) {
public String getDataSourceName(Map<String, Object> hints, String logicalTableName) {
return m_dataSourceName;
}
@Override
public String getLogicalTableName() {
return m_logicalTableName;
}
@Override
public String getPhysicalTableName(Map<String, Object> hints) {
public String getPhysicalTableName(Map<String, Object> hints, String logicalTableName) {
AppCommandData command = (AppCommandData) hints.get(QueryEngine.HINT_DATA_OBJECT);
return m_physicalTableName + "_" + command.getCommandId();
}
public void setDataSourceName(String dataSourceName) {
m_dataSourceName = dataSourceName;
}
public void setLogicalTableName(String logicalTableName) {
m_logicalTableName = logicalTableName;
}
public void setDataSourceName(String dataSourceName) {
m_dataSourceName = dataSourceName;
}
public void setPhysicalTableName(String physicalTableName) {
m_physicalTableName = physicalTableName;
}
}
\ No newline at end of file
cat-core/src/main/java/com/dianping/cat/config/app/AppConnectionTableProvider.java
浏览文件 @ 738ced1b
......@@ -8,36 +8,27 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import com.dianping.cat.app.AppConnectionData;
public class AppConnectionTableProvider implements TableProvider {
private String m_logicalTableName = "app-connection-data";
private String m_physicalTableName = "app_connection_data";
private String m_dataSourceName = "app";
@Override
public String getDataSourceName(Map<String, Object> hints) {
public String getDataSourceName(Map<String, Object> hints, String logicalTableName) {
return m_dataSourceName;
}
@Override
public String getLogicalTableName() {
return m_logicalTableName;
}
@Override
public String getPhysicalTableName(Map<String, Object> hints) {
public String getPhysicalTableName(Map<String, Object> hints, String logicalTableName) {
AppConnectionData data = (AppConnectionData) hints.get(QueryEngine.HINT_DATA_OBJECT);
return m_physicalTableName + "_" + data.getCommandId();
}
public void setDataSourceName(String dataSourceName) {
m_dataSourceName = dataSourceName;
}
public void setLogicalTableName(String logicalTableName) {
m_logicalTableName = logicalTableName;
}
public void setDataSourceName(String dataSourceName) {
m_dataSourceName = dataSourceName;
}
public void setPhysicalTableName(String physicalTableName) {
m_physicalTableName = physicalTableName;
}
}
\ No newline at end of file
cat-core/src/main/java/com/dianping/cat/config/app/AppSpeedTableProvider.java
浏览文件 @ 738ced1b
......@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import com.dianping.cat.app.AppSpeedData;
public class AppSpeedTableProvider implements TableProvider {
private String m_logicalTableName = "app-speed-data";
private String m_physicalTableName = "app_speed_data";
private String m_dataSourceName = "app";
@Override
public String getDataSourceName(Map<String, Object> hints) {
public String getDataSourceName(Map<String, Object> hints, String logicalTableName) {
return m_dataSourceName;
}
@Override
public String getLogicalTableName() {
return m_logicalTableName;
}
@Override
public String getPhysicalTableName(Map<String, Object> hints) {
public String getPhysicalTableName(Map<String, Object> hints, String logicalTableName) {
AppSpeedData data = (AppSpeedData) hints.get(QueryEngine.HINT_DATA_OBJECT);
return m_physicalTableName + "_" + data.getSpeedId();
......@@ -36,8 +28,7 @@ public class AppSpeedTableProvider implements TableProvider {
m_dataSourceName = dataSourceName;
}
public void setLogicalTableName(String logicalTableName) {
m_logicalTableName = logicalTableName;
}
public void setPhysicalTableName(String physicalTableName) {
m_physicalTableName = physicalTableName;
}
}
\ No newline at end of file
cat-core/src/main/java/com/dianping/cat/config/app/WebApiTableProvider.java
浏览文件 @ 738ced1b
......@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import com.dianping.cat.app.WebApiData;
public class WebApiTableProvider implements TableProvider {
private String m_logicalTableName = "web-api-data";
private String m_physicalTableName = "web_api_data";
private String m_dataSourceName = "app";
@Override
public String getDataSourceName(Map<String, Object> hints) {
public String getDataSourceName(Map<String, Object> hints, String logicalTableName) {
return m_dataSourceName;
}
@Override
public String getLogicalTableName() {
return m_logicalTableName;
}
@Override
public String getPhysicalTableName(Map<String, Object> hints) {
public String getPhysicalTableName(Map<String, Object> hints, String logicalTableName) {
WebApiData webApiData = (WebApiData) hints.get(QueryEngine.HINT_DATA_OBJECT);
return m_physicalTableName + "_" + webApiData.getApiId();
......@@ -36,8 +28,7 @@ public class WebApiTableProvider implements TableProvider {
m_dataSourceName = dataSourceName;
}
public void setLogicalTableName(String logicalTableName) {
m_logicalTableName = logicalTableName;
}
public void setPhysicalTableName(String physicalTableName) {
m_physicalTableName = physicalTableName;
}
}
\ No newline at end of file
cat-core/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ 738ced1b
......@@ -207,8 +207,8 @@
<implementation>com.dianping.cat.CatCoreModule</implementation>
</component>
<component>
<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</role>
<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</implementation>
<role>org.unidal.dal.jdbc.datasource.DataSourceProvider</role>
<implementation>org.unidal.dal.jdbc.datasource.DefaultDataSourceProvider</implementation>
<configuration>
<datasourceFile>/data/appdatas/cat/datasources.xml</datasourceFile>
</configuration>
......@@ -218,7 +218,6 @@
<role-hint>config</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>config</logical-table-name>
<physical-table-name>config</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -237,7 +236,6 @@
<role-hint>daily-report-content</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>daily-report-content</logical-table-name>
<physical-table-name>daily_report_content</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -247,7 +245,6 @@
<role-hint>dailygraph</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>dailygraph</logical-table-name>
<physical-table-name>dailygraph</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -257,7 +254,6 @@
<role-hint>dailyreport</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>dailyreport</logical-table-name>
<physical-table-name>dailyreport</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -267,7 +263,6 @@
<role-hint>graph</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>graph</logical-table-name>
<physical-table-name>graph</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -277,7 +272,6 @@
<role-hint>hostinfo</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>hostinfo</logical-table-name>
<physical-table-name>hostinfo</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -287,7 +281,6 @@
<role-hint>monthly-report-content</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>monthly-report-content</logical-table-name>
<physical-table-name>monthly_report_content</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -297,7 +290,6 @@
<role-hint>monthreport</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>monthreport</logical-table-name>
<physical-table-name>monthreport</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -307,7 +299,6 @@
<role-hint>project</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>project</logical-table-name>
<physical-table-name>project</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -317,7 +308,6 @@
<role-hint>report</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>report</logical-table-name>
<physical-table-name>report</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -327,7 +317,6 @@
<role-hint>report-content</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>report-content</logical-table-name>
<physical-table-name>report_content</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -337,7 +326,6 @@
<role-hint>task</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>task</logical-table-name>
<physical-table-name>task</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -347,7 +335,6 @@
<role-hint>weekly-report-content</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>weekly-report-content</logical-table-name>
<physical-table-name>weekly_report_content</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -357,7 +344,6 @@
<role-hint>weeklyreport</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>weeklyreport</logical-table-name>
<physical-table-name>weeklyreport</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......
cat-hadoop/pom.xml
浏览文件 @ 738ced1b
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.dianping.cat</groupId>
<artifactId>parent</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cat-hadoop</artifactId>
......
cat-home/pom.xml
浏览文件 @ 738ced1b
......@@ -3,7 +3,7 @@
<parent>
<groupId>com.dianping.cat</groupId>
<artifactId>parent</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cat-home</artifactId>
......
cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
浏览文件 @ 738ced1b
......@@ -3,12 +3,11 @@ package com.dianping.cat.build;
import java.util.ArrayList;
import java.util.List;
import org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager;
import org.unidal.dal.jdbc.configuration.AbstractJdbcResourceConfigurator;
import org.unidal.dal.jdbc.mapping.TableProvider;
import org.unidal.initialization.DefaultModuleManager;
import org.unidal.initialization.Module;
import org.unidal.initialization.ModuleManager;
import org.unidal.lookup.configuration.AbstractResourceConfigurator;
import org.unidal.lookup.configuration.Component;
import com.dianping.cat.CatHomeModule;
......@@ -94,7 +93,7 @@ import com.dianping.cat.system.page.router.config.RouterConfigHandler;
import com.dianping.cat.system.page.router.config.RouterConfigManager;
import com.dianping.cat.system.page.router.service.RouterConfigService;
public class ComponentsConfigurator extends AbstractResourceConfigurator {
public class ComponentsConfigurator extends AbstractJdbcResourceConfigurator {
public static void main(String[] args) {
generatePlexusComponentsXmlFile(new ComponentsConfigurator());
}
......@@ -166,8 +165,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
all.add(C(TableProvider.class, "web-api-data", WebApiTableProvider.class));
// database
all.add(C(JdbcDataSourceDescriptorManager.class) //
.config(E("datasourceFile").value("/data/appdatas/cat/datasources.xml")));
all.add(defineJdbcDataSourceConfigurationManagerComponent("/data/appdatas/cat/datasources.xml"));
all.addAll(new CatDatabaseConfigurator().defineComponents());
all.addAll(new AppDatabaseConfigurator().defineComponents());
......
cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
浏览文件 @ 738ced1b
......@@ -213,9 +213,10 @@ public class Handler implements PageHandler<Context> {
switch (action) {
case HOURLY_REPORT:
TransactionReport report = getHourlyReport(payload);
report = m_mergeHelper.mergeAllMachines(report, ipAddress);
if (report != null) {
report = m_mergeHelper.mergeAllMachines(report, ipAddress);
model.setReport(report);
buildTransactionMetaInfo(model, payload, report);
}
......
cat-home/src/main/java/com/dianping/cat/system/page/router/config/RouterConfigManager.java
浏览文件 @ 738ced1b
......@@ -68,7 +68,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
private static final long serialVersionUID = 1L;
@Override
protected boolean removeEldestEntry(Entry<Long, Pair<RouterConfig, Long>> eldest) {
protected boolean removeEldestEntry(
Entry<Long, Pair<RouterConfig, Long>> eldest) {
return size() > 100;
}
};
......@@ -98,7 +99,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
@Override
public void initialize() throws InitializationException {
try {
Config config = m_configDao.findByName(CONFIG_NAME, ConfigEntity.READSET_FULL);
Config config = m_configDao.findByName(CONFIG_NAME,
ConfigEntity.READSET_FULL);
String content = config.getContent();
m_configId = config.getId();
......@@ -143,7 +145,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
}
public Server queryBackUpServer() {
return new Server().setId(m_routerConfig.getBackupServer()).setPort(m_routerConfig.getBackupServerPort());
return new Server().setId(m_routerConfig.getBackupServer()).setPort(
m_routerConfig.getBackupServerPort());
}
public List<Server> queryEnableServers() {
......@@ -152,7 +155,9 @@ public class RouterConfigManager implements Initializable, LogEnabled {
for (DefaultServer server : servers) {
if (server.isEnable()) {
result.add(new Server().setId(server.getId()).setPort(server.getPort()).setWeight(server.getWeight()));
result.add(new Server().setId(server.getId())
.setPort(server.getPort())
.setWeight(server.getWeight()));
}
}
return result;
......@@ -167,11 +172,14 @@ public class RouterConfigManager implements Initializable, LogEnabled {
int length = servers.size();
int hashCode = domain.hashCode();
for (int i = 0; i < 2; i++) {
int index = Math.abs((hashCode + i)) % length;
if (length > 0) {
for (int i = 0; i < 2; i++) {
int index = Math.abs((hashCode + i)) % length;
addServerList(result, servers.get(index));
addServerList(result, servers.get(index));
}
}
addServerList(result, queryBackUpServer());
} else {
for (Server server : domainConfig.getServers()) {
......@@ -189,20 +197,24 @@ public class RouterConfigManager implements Initializable, LogEnabled {
private void refreshReportInfo() throws Exception {
Date period = TimeHelper.getCurrentDay(-1);
long time = period.getTime();
try {
DailyReport report = m_dailyReportDao.findByDomainNamePeriod(Constants.CAT, RouterConfigBuilder.ID, period,
DailyReportEntity.READSET_FULL);
DailyReport report = m_dailyReportDao.findByDomainNamePeriod(
Constants.CAT, RouterConfigBuilder.ID, period,
DailyReportEntity.READSET_FULL);
long modifyTime = report.getCreationDate().getTime();
Pair<RouterConfig, Long> pair = m_routerConfigs.get(time);
if (pair == null || modifyTime > pair.getValue()) {
try {
DailyReportContent reportContent = m_dailyReportContentDao.findByPK(report.getId(),
DailyReportContentEntity.READSET_FULL);
RouterConfig routerConfig = DefaultNativeParser.parse(reportContent.getContent());
m_routerConfigs.put(time, new Pair<RouterConfig, Long>(routerConfig, modifyTime));
DailyReportContent reportContent = m_dailyReportContentDao
.findByPK(report.getId(),
DailyReportContentEntity.READSET_FULL);
RouterConfig routerConfig = DefaultNativeParser
.parse(reportContent.getContent());
m_routerConfigs.put(time, new Pair<RouterConfig, Long>(
routerConfig, modifyTime));
Cat.logEvent("ReloadConfig", "router");
} catch (DalNotFoundException e) {
// ignore
......@@ -217,8 +229,10 @@ public class RouterConfigManager implements Initializable, LogEnabled {
}
}
private void refreshConfigInfo() throws DalException, SAXException, IOException {
Config config = m_configDao.findByName(CONFIG_NAME, ConfigEntity.READSET_FULL);
private void refreshConfigInfo() throws DalException, SAXException,
IOException {
Config config = m_configDao.findByName(CONFIG_NAME,
ConfigEntity.READSET_FULL);
long modifyTime = config.getModifyDate().getTime();
synchronized (this) {
......
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ 738ced1b
......@@ -2423,8 +2423,8 @@
<implementation>com.dianping.cat.config.app.WebApiTableProvider</implementation>
</component>
<component>
<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</role>
<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSourceDescriptorManager</implementation>
<role>org.unidal.dal.jdbc.datasource.DataSourceProvider</role>
<implementation>org.unidal.dal.jdbc.datasource.DefaultDataSourceProvider</implementation>
<configuration>
<datasourceFile>/data/appdatas/cat/datasources.xml</datasourceFile>
</configuration>
......@@ -2434,7 +2434,6 @@
<role-hint>alert</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>alert</logical-table-name>
<physical-table-name>alert</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2444,7 +2443,6 @@
<role-hint>alert-summary</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>alert-summary</logical-table-name>
<physical-table-name>alert_summary</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2454,7 +2452,6 @@
<role-hint>alteration</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>alteration</logical-table-name>
<physical-table-name>alteration</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2464,7 +2461,6 @@
<role-hint>baseline</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>baseline</logical-table-name>
<physical-table-name>baseline</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2474,7 +2470,6 @@
<role-hint>config-modification</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>config-modification</logical-table-name>
<physical-table-name>config_modification</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2484,7 +2479,6 @@
<role-hint>overload</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>overload</logical-table-name>
<physical-table-name>overload</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2494,7 +2488,6 @@
<role-hint>topology-graph</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>topology-graph</logical-table-name>
<physical-table-name>topologyGraph</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2504,7 +2497,6 @@
<role-hint>user-define-rule</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>user-define-rule</logical-table-name>
<physical-table-name>user_define_rule</physical-table-name>
<data-source-name>cat</data-source-name>
</configuration>
......@@ -2586,7 +2578,6 @@
<role-hint>app-command-data</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>app-command-data</logical-table-name>
<physical-table-name>app_command_data</physical-table-name>
<data-source-name>app</data-source-name>
</configuration>
......@@ -2596,7 +2587,6 @@
<role-hint>app-connection-data</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>app-connection-data</logical-table-name>
<physical-table-name>app_connection_data</physical-table-name>
<data-source-name>app</data-source-name>
</configuration>
......@@ -2606,7 +2596,6 @@
<role-hint>app-speed-data</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>app-speed-data</logical-table-name>
<physical-table-name>app_speed_data</physical-table-name>
<data-source-name>app</data-source-name>
</configuration>
......@@ -2616,7 +2605,6 @@
<role-hint>web-api-data</role-hint>
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
<configuration>
<logical-table-name>web-api-data</logical-table-name>
<physical-table-name>web_api_data</physical-table-name>
<data-source-name>app</data-source-name>
</configuration>
......@@ -3600,11 +3588,6 @@
<component>
<role>com.dianping.cat.core.config.ConfigDao</role>
<implementation>com.dianping.cat.core.config.ConfigDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.problem.Handler</role>
......@@ -3653,20 +3636,10 @@
<component>
<role>com.dianping.cat.core.dal.GraphDao</role>
<implementation>com.dianping.cat.core.dal.GraphDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.DailyGraphDao</role>
<implementation>com.dianping.cat.core.dal.DailyGraphDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.problem.JspViewer</role>
......@@ -3710,74 +3683,34 @@
<component>
<role>com.dianping.cat.core.dal.HourlyReportDao</role>
<implementation>com.dianping.cat.core.dal.HourlyReportDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.HourlyReportContentDao</role>
<implementation>com.dianping.cat.core.dal.HourlyReportContentDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.DailyReportDao</role>
<implementation>com.dianping.cat.core.dal.DailyReportDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.DailyReportContentDao</role>
<implementation>com.dianping.cat.core.dal.DailyReportContentDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.WeeklyReportDao</role>
<implementation>com.dianping.cat.core.dal.WeeklyReportDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.WeeklyReportContentDao</role>
<implementation>com.dianping.cat.core.dal.WeeklyReportContentDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.MonthlyReportDao</role>
<implementation>com.dianping.cat.core.dal.MonthlyReportDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.core.dal.MonthlyReportContentDao</role>
<implementation>com.dianping.cat.core.dal.MonthlyReportContentDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.DomainGroupConfigManager</role>
......@@ -4285,11 +4218,6 @@
<component>
<role>com.dianping.cat.core.dal.HostinfoDao</role>
<implementation>com.dianping.cat.core.dal.HostinfoDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.cache.Handler</role>
......@@ -4539,11 +4467,6 @@
<component>
<role>com.dianping.cat.core.dal.ProjectDao</role>
<implementation>com.dianping.cat.core.dal.ProjectDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.consumer.metric.MetricConfigManager</role>
......@@ -4645,11 +4568,6 @@
<component>
<role>com.dianping.cat.home.dal.report.TopologyGraphDao</role>
<implementation>com.dianping.cat.home.dal.report.TopologyGraphDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.dependency.config.TopoGraphFormatConfigManager</role>
......@@ -5016,11 +4934,6 @@
<component>
<role>com.dianping.cat.home.dal.report.AlterationDao</role>
<implementation>com.dianping.cat.home.dal.report.AlterationDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.monitor.Handler</role>
......@@ -5256,11 +5169,6 @@
<component>
<role>com.dianping.cat.app.WebApiDataDao</role>
<implementation>com.dianping.cat.app.WebApiDataDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.system.Handler</role>
......@@ -5460,11 +5368,6 @@
<component>
<role>com.dianping.cat.app.AppCommandDataDao</role>
<implementation>com.dianping.cat.app.AppCommandDataDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.app.service.AppSpeedService</role>
......@@ -5478,11 +5381,6 @@
<component>
<role>com.dianping.cat.app.AppSpeedDataDao</role>
<implementation>com.dianping.cat.app.AppSpeedDataDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.app.display.AppConnectionGraphCreator</role>
......@@ -5511,11 +5409,6 @@
<component>
<role>com.dianping.cat.app.AppConnectionDataDao</role>
<implementation>com.dianping.cat.app.AppConnectionDataDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.alert.app.AppRuleConfigManager</role>
......@@ -5544,11 +5437,6 @@
<component>
<role>com.dianping.cat.home.dal.report.UserDefineRuleDao</role>
<implementation>com.dianping.cat.home.dal.report.UserDefineRuleDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.app.processor.CrashLogProcessor</role>
......@@ -5627,11 +5515,6 @@
<component>
<role>com.dianping.cat.home.dal.report.AlertDao</role>
<implementation>com.dianping.cat.home.dal.report.AlertDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.overload.Handler</role>
......@@ -5678,11 +5561,6 @@
<component>
<role>com.dianping.cat.home.dal.report.OverloadDao</role>
<implementation>com.dianping.cat.home.dal.report.OverloadDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.database.Handler</role>
......@@ -6732,11 +6610,6 @@
<component>
<role>com.dianping.cat.home.dal.report.ConfigModificationDao</role>
<implementation>com.dianping.cat.home.dal.report.ConfigModificationDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.system.page.plugin.Handler</role>
......
cat-maven-plugin/pom.xml
浏览文件 @ 738ced1b
......@@ -4,7 +4,7 @@
<parent>
<groupId>com.dianping.cat</groupId>
<artifactId>parent</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cat-maven-plugin</artifactId>
......
pom.xml
浏览文件 @ 738ced1b
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.dianping.cat</groupId>
<artifactId>parent</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
<name>parent</name>
<description>Central Application Tracking</description>
<packaging>pom</packaging>
......@@ -46,22 +46,22 @@
<dependency>
<groupId>org.unidal.framework</groupId>
<artifactId>dal-jdbc</artifactId>
<version>2.2.0</version>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.unidal.framework</groupId>
<artifactId>foundation-service</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.unidal.framework</groupId>
<artifactId>web-framework</artifactId>
<version>2.2.1</version>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.unidal.framework</groupId>
<artifactId>test-framework</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.unidal.webres</groupId>
......@@ -181,17 +181,17 @@ org.eclipse.jdt.core.compiler.compliance=1.6
<plugin>
<groupId>org.unidal.maven.plugins</groupId>
<artifactId>codegen-maven-plugin</artifactId>
<version>2.1.3</version>
<version>2.3.2</version>
</plugin>
<plugin>
<groupId>org.unidal.maven.plugins</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<version>2.1.2</version>
<version>2.2.0</version>
</plugin>
<plugin>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-maven-plugin</artifactId>
<version>1.3.6-SNAPSHOT</version>
<version>1.3.6</version>
</plugin>
</plugins>
</pluginManagement>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或