Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
738ced1b
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
738ced1b
编写于
12月 06, 2015
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix jdk8 issues
上级
b946495c
变更
19
显示空白变更内容
内联
并排
Showing
19 changed file
with
88 addition
and
257 deletion
+88
-257
cat-client/pom.xml
cat-client/pom.xml
+1
-1
cat-consumer/pom.xml
cat-consumer/pom.xml
+1
-1
cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java
...m/dianping/cat/consumer/build/ComponentsConfigurator.java
+3
-5
cat-consumer/src/main/resources/META-INF/plexus/components.xml
...onsumer/src/main/resources/META-INF/plexus/components.xml
+2
-3
cat-core/pom.xml
cat-core/pom.xml
+1
-1
cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
...n/java/com/dianping/cat/build/ComponentsConfigurator.java
+3
-5
cat-core/src/main/java/com/dianping/cat/config/app/AppCommandTableProvider.java
.../com/dianping/cat/config/app/AppCommandTableProvider.java
+8
-17
cat-core/src/main/java/com/dianping/cat/config/app/AppConnectionTableProvider.java
...m/dianping/cat/config/app/AppConnectionTableProvider.java
+8
-17
cat-core/src/main/java/com/dianping/cat/config/app/AppSpeedTableProvider.java
...va/com/dianping/cat/config/app/AppSpeedTableProvider.java
+5
-14
cat-core/src/main/java/com/dianping/cat/config/app/WebApiTableProvider.java
...java/com/dianping/cat/config/app/WebApiTableProvider.java
+5
-14
cat-core/src/main/resources/META-INF/plexus/components.xml
cat-core/src/main/resources/META-INF/plexus/components.xml
+2
-16
cat-hadoop/pom.xml
cat-hadoop/pom.xml
+1
-1
cat-home/pom.xml
cat-home/pom.xml
+1
-1
cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
...n/java/com/dianping/cat/build/ComponentsConfigurator.java
+3
-5
cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
...ava/com/dianping/cat/report/page/transaction/Handler.java
+2
-1
cat-home/src/main/java/com/dianping/cat/system/page/router/config/RouterConfigManager.java
...ng/cat/system/page/router/config/RouterConfigManager.java
+31
-17
cat-home/src/main/resources/META-INF/plexus/components.xml
cat-home/src/main/resources/META-INF/plexus/components.xml
+2
-129
cat-maven-plugin/pom.xml
cat-maven-plugin/pom.xml
+1
-1
pom.xml
pom.xml
+8
-8
未找到文件。
cat-client/pom.xml
浏览文件 @
738ced1b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
parent
</artifactId>
<artifactId>
parent
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-client
</artifactId>
<artifactId>
cat-client
</artifactId>
...
...
cat-consumer/pom.xml
浏览文件 @
738ced1b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
parent
</artifactId>
<artifactId>
parent
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-consumer
</artifactId>
<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;
...
@@ -4,9 +4,8 @@ import java.util.ArrayList;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
import
org.unidal.dal.jdbc.
datasource.JdbcDataSourceDescriptorManage
r
;
import
org.unidal.dal.jdbc.
configuration.AbstractJdbcResourceConfigurato
r
;
import
org.unidal.initialization.Module
;
import
org.unidal.initialization.Module
;
import
org.unidal.lookup.configuration.AbstractResourceConfigurator
;
import
org.unidal.lookup.configuration.Component
;
import
org.unidal.lookup.configuration.Component
;
import
com.dianping.cat.analysis.MessageAnalyzer
;
import
com.dianping.cat.analysis.MessageAnalyzer
;
...
@@ -64,7 +63,7 @@ import com.dianping.cat.service.ProjectService;
...
@@ -64,7 +63,7 @@ import com.dianping.cat.service.ProjectService;
import
com.dianping.cat.statistic.ServerStatisticManager
;
import
com.dianping.cat.statistic.ServerStatisticManager
;
import
com.dianping.cat.task.TaskManager
;
import
com.dianping.cat.task.TaskManager
;
public
class
ComponentsConfigurator
extends
AbstractResourceConfigurator
{
public
class
ComponentsConfigurator
extends
Abstract
Jdbc
ResourceConfigurator
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
generatePlexusComponentsXmlFile
(
new
ComponentsConfigurator
());
generatePlexusComponentsXmlFile
(
new
ComponentsConfigurator
());
}
}
...
@@ -286,8 +285,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
...
@@ -286,8 +285,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
ServerFilterConfigManager
.
class
,
StorageReportUpdater
.
class
));
ServerFilterConfigManager
.
class
,
StorageReportUpdater
.
class
));
// database
// database
all
.
add
(
C
(
JdbcDataSourceDescriptorManager
.
class
)
//
all
.
add
(
defineJdbcDataSourceConfigurationManagerComponent
(
"/data/appdatas/cat/datasources.xml"
));
.
config
(
E
(
"datasourceFile"
).
value
(
"/data/appdatas/cat/datasources.xml"
)));
return
all
;
return
all
;
}
}
...
...
cat-consumer/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
738ced1b
...
@@ -750,8 +750,8 @@
...
@@ -750,8 +750,8 @@
</requirements>
</requirements>
</component>
</component>
<component>
<component>
<role>
org.unidal.dal.jdbc.datasource.
JdbcDataSourceDescriptorManag
er
</role>
<role>
org.unidal.dal.jdbc.datasource.
DataSourceProvid
er
</role>
<implementation>
org.unidal.dal.jdbc.datasource.
JdbcDataSourceDescriptorManag
er
</implementation>
<implementation>
org.unidal.dal.jdbc.datasource.
DefaultDataSourceProvid
er
</implementation>
<configuration>
<configuration>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
</configuration>
</configuration>
...
@@ -778,7 +778,6 @@
...
@@ -778,7 +778,6 @@
<role-hint>
business-report
</role-hint>
<role-hint>
business-report
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
business-report
</logical-table-name>
<physical-table-name>
businessReport
</physical-table-name>
<physical-table-name>
businessReport
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
...
cat-core/pom.xml
浏览文件 @
738ced1b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<parent>
<parent>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
parent
</artifactId>
<artifactId>
parent
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-core
</artifactId>
<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;
...
@@ -3,9 +3,8 @@ package com.dianping.cat.build;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
org.unidal.dal.jdbc.
datasource.JdbcDataSourceDescriptorManage
r
;
import
org.unidal.dal.jdbc.
configuration.AbstractJdbcResourceConfigurato
r
;
import
org.unidal.initialization.Module
;
import
org.unidal.initialization.Module
;
import
org.unidal.lookup.configuration.AbstractResourceConfigurator
;
import
org.unidal.lookup.configuration.Component
;
import
org.unidal.lookup.configuration.Component
;
import
com.dianping.cat.CatCoreModule
;
import
com.dianping.cat.CatCoreModule
;
...
@@ -46,7 +45,7 @@ import com.dianping.cat.service.IpService;
...
@@ -46,7 +45,7 @@ import com.dianping.cat.service.IpService;
import
com.dianping.cat.statistic.ServerStatisticManager
;
import
com.dianping.cat.statistic.ServerStatisticManager
;
import
com.dianping.cat.task.TaskManager
;
import
com.dianping.cat.task.TaskManager
;
public
class
ComponentsConfigurator
extends
AbstractResourceConfigurator
{
public
class
ComponentsConfigurator
extends
Abstract
Jdbc
ResourceConfigurator
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
generatePlexusComponentsXmlFile
(
new
ComponentsConfigurator
());
generatePlexusComponentsXmlFile
(
new
ComponentsConfigurator
());
}
}
...
@@ -99,8 +98,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
...
@@ -99,8 +98,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
all
.
add
(
C
(
Module
.
class
,
CatCoreModule
.
ID
,
CatCoreModule
.
class
));
all
.
add
(
C
(
Module
.
class
,
CatCoreModule
.
ID
,
CatCoreModule
.
class
));
// database
// database
all
.
add
(
C
(
JdbcDataSourceDescriptorManager
.
class
)
//
all
.
add
(
defineJdbcDataSourceConfigurationManagerComponent
(
"/data/appdatas/cat/datasources.xml"
));
.
config
(
E
(
"datasourceFile"
).
value
(
"/data/appdatas/cat/datasources.xml"
)));
all
.
addAll
(
new
CatCoreDatabaseConfigurator
().
defineComponents
());
all
.
addAll
(
new
CatCoreDatabaseConfigurator
().
defineComponents
());
all
.
addAll
(
new
CodecComponentConfigurator
().
defineComponents
());
all
.
addAll
(
new
CodecComponentConfigurator
().
defineComponents
());
...
...
cat-core/src/main/java/com/dianping/cat/config/app/AppCommandTableProvider.java
浏览文件 @
738ced1b
...
@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
...
@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import
com.dianping.cat.app.AppCommandData
;
import
com.dianping.cat.app.AppCommandData
;
public
class
AppCommandTableProvider
implements
TableProvider
{
public
class
AppCommandTableProvider
implements
TableProvider
{
private
String
m_logicalTableName
=
"app-command-data"
;
private
String
m_physicalTableName
=
"app_command_data"
;
private
String
m_physicalTableName
=
"app_command_data"
;
private
String
m_dataSourceName
=
"app"
;
private
String
m_dataSourceName
=
"app"
;
@Override
@Override
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
)
{
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_dataSourceName
;
return
m_dataSourceName
;
}
}
@Override
@Override
public
String
getLogicalTableName
()
{
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_logicalTableName
;
}
@Override
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
)
{
AppCommandData
command
=
(
AppCommandData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
AppCommandData
command
=
(
AppCommandData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
return
m_physicalTableName
+
"_"
+
command
.
getCommandId
();
return
m_physicalTableName
+
"_"
+
command
.
getCommandId
();
...
@@ -36,8 +28,7 @@ public class AppCommandTableProvider implements TableProvider {
...
@@ -36,8 +28,7 @@ public class AppCommandTableProvider implements TableProvider {
m_dataSourceName
=
dataSourceName
;
m_dataSourceName
=
dataSourceName
;
}
}
public
void
setLogicalTableName
(
String
log
icalTableName
)
{
public
void
setPhysicalTableName
(
String
phys
icalTableName
)
{
m_logicalTableName
=
log
icalTableName
;
m_physicalTableName
=
phys
icalTableName
;
}
}
}
}
\ No newline at end of file
cat-core/src/main/java/com/dianping/cat/config/app/AppConnectionTableProvider.java
浏览文件 @
738ced1b
...
@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
...
@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import
com.dianping.cat.app.AppConnectionData
;
import
com.dianping.cat.app.AppConnectionData
;
public
class
AppConnectionTableProvider
implements
TableProvider
{
public
class
AppConnectionTableProvider
implements
TableProvider
{
private
String
m_logicalTableName
=
"app-connection-data"
;
private
String
m_physicalTableName
=
"app_connection_data"
;
private
String
m_physicalTableName
=
"app_connection_data"
;
private
String
m_dataSourceName
=
"app"
;
private
String
m_dataSourceName
=
"app"
;
@Override
@Override
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
)
{
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_dataSourceName
;
return
m_dataSourceName
;
}
}
@Override
@Override
public
String
getLogicalTableName
()
{
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_logicalTableName
;
}
@Override
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
)
{
AppConnectionData
data
=
(
AppConnectionData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
AppConnectionData
data
=
(
AppConnectionData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
return
m_physicalTableName
+
"_"
+
data
.
getCommandId
();
return
m_physicalTableName
+
"_"
+
data
.
getCommandId
();
...
@@ -36,8 +28,7 @@ public class AppConnectionTableProvider implements TableProvider {
...
@@ -36,8 +28,7 @@ public class AppConnectionTableProvider implements TableProvider {
m_dataSourceName
=
dataSourceName
;
m_dataSourceName
=
dataSourceName
;
}
}
public
void
setLogicalTableName
(
String
log
icalTableName
)
{
public
void
setPhysicalTableName
(
String
phys
icalTableName
)
{
m_logicalTableName
=
log
icalTableName
;
m_physicalTableName
=
phys
icalTableName
;
}
}
}
}
\ 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;
...
@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import
com.dianping.cat.app.AppSpeedData
;
import
com.dianping.cat.app.AppSpeedData
;
public
class
AppSpeedTableProvider
implements
TableProvider
{
public
class
AppSpeedTableProvider
implements
TableProvider
{
private
String
m_logicalTableName
=
"app-speed-data"
;
private
String
m_physicalTableName
=
"app_speed_data"
;
private
String
m_physicalTableName
=
"app_speed_data"
;
private
String
m_dataSourceName
=
"app"
;
private
String
m_dataSourceName
=
"app"
;
@Override
@Override
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
)
{
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_dataSourceName
;
return
m_dataSourceName
;
}
}
@Override
@Override
public
String
getLogicalTableName
()
{
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_logicalTableName
;
}
@Override
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
)
{
AppSpeedData
data
=
(
AppSpeedData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
AppSpeedData
data
=
(
AppSpeedData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
return
m_physicalTableName
+
"_"
+
data
.
getSpeedId
();
return
m_physicalTableName
+
"_"
+
data
.
getSpeedId
();
...
@@ -36,8 +28,7 @@ public class AppSpeedTableProvider implements TableProvider {
...
@@ -36,8 +28,7 @@ public class AppSpeedTableProvider implements TableProvider {
m_dataSourceName
=
dataSourceName
;
m_dataSourceName
=
dataSourceName
;
}
}
public
void
setLogicalTableName
(
String
log
icalTableName
)
{
public
void
setPhysicalTableName
(
String
phys
icalTableName
)
{
m_logicalTableName
=
log
icalTableName
;
m_physicalTableName
=
phys
icalTableName
;
}
}
}
}
\ 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;
...
@@ -8,25 +8,17 @@ import org.unidal.dal.jdbc.mapping.TableProvider;
import
com.dianping.cat.app.WebApiData
;
import
com.dianping.cat.app.WebApiData
;
public
class
WebApiTableProvider
implements
TableProvider
{
public
class
WebApiTableProvider
implements
TableProvider
{
private
String
m_logicalTableName
=
"web-api-data"
;
private
String
m_physicalTableName
=
"web_api_data"
;
private
String
m_physicalTableName
=
"web_api_data"
;
private
String
m_dataSourceName
=
"app"
;
private
String
m_dataSourceName
=
"app"
;
@Override
@Override
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
)
{
public
String
getDataSourceName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_dataSourceName
;
return
m_dataSourceName
;
}
}
@Override
@Override
public
String
getLogicalTableName
()
{
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
,
String
logicalTableName
)
{
return
m_logicalTableName
;
}
@Override
public
String
getPhysicalTableName
(
Map
<
String
,
Object
>
hints
)
{
WebApiData
webApiData
=
(
WebApiData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
WebApiData
webApiData
=
(
WebApiData
)
hints
.
get
(
QueryEngine
.
HINT_DATA_OBJECT
);
return
m_physicalTableName
+
"_"
+
webApiData
.
getApiId
();
return
m_physicalTableName
+
"_"
+
webApiData
.
getApiId
();
...
@@ -36,8 +28,7 @@ public class WebApiTableProvider implements TableProvider {
...
@@ -36,8 +28,7 @@ public class WebApiTableProvider implements TableProvider {
m_dataSourceName
=
dataSourceName
;
m_dataSourceName
=
dataSourceName
;
}
}
public
void
setLogicalTableName
(
String
log
icalTableName
)
{
public
void
setPhysicalTableName
(
String
phys
icalTableName
)
{
m_logicalTableName
=
log
icalTableName
;
m_physicalTableName
=
phys
icalTableName
;
}
}
}
}
\ No newline at end of file
cat-core/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
738ced1b
...
@@ -207,8 +207,8 @@
...
@@ -207,8 +207,8 @@
<implementation>
com.dianping.cat.CatCoreModule
</implementation>
<implementation>
com.dianping.cat.CatCoreModule
</implementation>
</component>
</component>
<component>
<component>
<role>
org.unidal.dal.jdbc.datasource.
JdbcDataSourceDescriptorManag
er
</role>
<role>
org.unidal.dal.jdbc.datasource.
DataSourceProvid
er
</role>
<implementation>
org.unidal.dal.jdbc.datasource.
JdbcDataSourceDescriptorManag
er
</implementation>
<implementation>
org.unidal.dal.jdbc.datasource.
DefaultDataSourceProvid
er
</implementation>
<configuration>
<configuration>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
</configuration>
</configuration>
...
@@ -218,7 +218,6 @@
...
@@ -218,7 +218,6 @@
<role-hint>
config
</role-hint>
<role-hint>
config
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
config
</logical-table-name>
<physical-table-name>
config
</physical-table-name>
<physical-table-name>
config
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -237,7 +236,6 @@
...
@@ -237,7 +236,6 @@
<role-hint>
daily-report-content
</role-hint>
<role-hint>
daily-report-content
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
daily-report-content
</logical-table-name>
<physical-table-name>
daily_report_content
</physical-table-name>
<physical-table-name>
daily_report_content
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -247,7 +245,6 @@
...
@@ -247,7 +245,6 @@
<role-hint>
dailygraph
</role-hint>
<role-hint>
dailygraph
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
dailygraph
</logical-table-name>
<physical-table-name>
dailygraph
</physical-table-name>
<physical-table-name>
dailygraph
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -257,7 +254,6 @@
...
@@ -257,7 +254,6 @@
<role-hint>
dailyreport
</role-hint>
<role-hint>
dailyreport
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
dailyreport
</logical-table-name>
<physical-table-name>
dailyreport
</physical-table-name>
<physical-table-name>
dailyreport
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -267,7 +263,6 @@
...
@@ -267,7 +263,6 @@
<role-hint>
graph
</role-hint>
<role-hint>
graph
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
graph
</logical-table-name>
<physical-table-name>
graph
</physical-table-name>
<physical-table-name>
graph
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -277,7 +272,6 @@
...
@@ -277,7 +272,6 @@
<role-hint>
hostinfo
</role-hint>
<role-hint>
hostinfo
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
hostinfo
</logical-table-name>
<physical-table-name>
hostinfo
</physical-table-name>
<physical-table-name>
hostinfo
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -287,7 +281,6 @@
...
@@ -287,7 +281,6 @@
<role-hint>
monthly-report-content
</role-hint>
<role-hint>
monthly-report-content
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
monthly-report-content
</logical-table-name>
<physical-table-name>
monthly_report_content
</physical-table-name>
<physical-table-name>
monthly_report_content
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -297,7 +290,6 @@
...
@@ -297,7 +290,6 @@
<role-hint>
monthreport
</role-hint>
<role-hint>
monthreport
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
monthreport
</logical-table-name>
<physical-table-name>
monthreport
</physical-table-name>
<physical-table-name>
monthreport
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -307,7 +299,6 @@
...
@@ -307,7 +299,6 @@
<role-hint>
project
</role-hint>
<role-hint>
project
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
project
</logical-table-name>
<physical-table-name>
project
</physical-table-name>
<physical-table-name>
project
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -317,7 +308,6 @@
...
@@ -317,7 +308,6 @@
<role-hint>
report
</role-hint>
<role-hint>
report
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
report
</logical-table-name>
<physical-table-name>
report
</physical-table-name>
<physical-table-name>
report
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -327,7 +317,6 @@
...
@@ -327,7 +317,6 @@
<role-hint>
report-content
</role-hint>
<role-hint>
report-content
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
report-content
</logical-table-name>
<physical-table-name>
report_content
</physical-table-name>
<physical-table-name>
report_content
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -337,7 +326,6 @@
...
@@ -337,7 +326,6 @@
<role-hint>
task
</role-hint>
<role-hint>
task
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
task
</logical-table-name>
<physical-table-name>
task
</physical-table-name>
<physical-table-name>
task
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -347,7 +335,6 @@
...
@@ -347,7 +335,6 @@
<role-hint>
weekly-report-content
</role-hint>
<role-hint>
weekly-report-content
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
weekly-report-content
</logical-table-name>
<physical-table-name>
weekly_report_content
</physical-table-name>
<physical-table-name>
weekly_report_content
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -357,7 +344,6 @@
...
@@ -357,7 +344,6 @@
<role-hint>
weeklyreport
</role-hint>
<role-hint>
weeklyreport
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
weeklyreport
</logical-table-name>
<physical-table-name>
weeklyreport
</physical-table-name>
<physical-table-name>
weeklyreport
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
...
cat-hadoop/pom.xml
浏览文件 @
738ced1b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
parent
</artifactId>
<artifactId>
parent
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-hadoop
</artifactId>
<artifactId>
cat-hadoop
</artifactId>
...
...
cat-home/pom.xml
浏览文件 @
738ced1b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<parent>
<parent>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
parent
</artifactId>
<artifactId>
parent
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-home
</artifactId>
<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;
...
@@ -3,12 +3,11 @@ package com.dianping.cat.build;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
org.unidal.dal.jdbc.
datasource.JdbcDataSourceDescriptorManage
r
;
import
org.unidal.dal.jdbc.
configuration.AbstractJdbcResourceConfigurato
r
;
import
org.unidal.dal.jdbc.mapping.TableProvider
;
import
org.unidal.dal.jdbc.mapping.TableProvider
;
import
org.unidal.initialization.DefaultModuleManager
;
import
org.unidal.initialization.DefaultModuleManager
;
import
org.unidal.initialization.Module
;
import
org.unidal.initialization.Module
;
import
org.unidal.initialization.ModuleManager
;
import
org.unidal.initialization.ModuleManager
;
import
org.unidal.lookup.configuration.AbstractResourceConfigurator
;
import
org.unidal.lookup.configuration.Component
;
import
org.unidal.lookup.configuration.Component
;
import
com.dianping.cat.CatHomeModule
;
import
com.dianping.cat.CatHomeModule
;
...
@@ -94,7 +93,7 @@ import com.dianping.cat.system.page.router.config.RouterConfigHandler;
...
@@ -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.config.RouterConfigManager
;
import
com.dianping.cat.system.page.router.service.RouterConfigService
;
import
com.dianping.cat.system.page.router.service.RouterConfigService
;
public
class
ComponentsConfigurator
extends
AbstractResourceConfigurator
{
public
class
ComponentsConfigurator
extends
Abstract
Jdbc
ResourceConfigurator
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
generatePlexusComponentsXmlFile
(
new
ComponentsConfigurator
());
generatePlexusComponentsXmlFile
(
new
ComponentsConfigurator
());
}
}
...
@@ -166,8 +165,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
...
@@ -166,8 +165,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
all
.
add
(
C
(
TableProvider
.
class
,
"web-api-data"
,
WebApiTableProvider
.
class
));
all
.
add
(
C
(
TableProvider
.
class
,
"web-api-data"
,
WebApiTableProvider
.
class
));
// database
// database
all
.
add
(
C
(
JdbcDataSourceDescriptorManager
.
class
)
//
all
.
add
(
defineJdbcDataSourceConfigurationManagerComponent
(
"/data/appdatas/cat/datasources.xml"
));
.
config
(
E
(
"datasourceFile"
).
value
(
"/data/appdatas/cat/datasources.xml"
)));
all
.
addAll
(
new
CatDatabaseConfigurator
().
defineComponents
());
all
.
addAll
(
new
CatDatabaseConfigurator
().
defineComponents
());
all
.
addAll
(
new
AppDatabaseConfigurator
().
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> {
...
@@ -213,9 +213,10 @@ public class Handler implements PageHandler<Context> {
switch
(
action
)
{
switch
(
action
)
{
case
HOURLY_REPORT:
case
HOURLY_REPORT:
TransactionReport
report
=
getHourlyReport
(
payload
);
TransactionReport
report
=
getHourlyReport
(
payload
);
report
=
m_mergeHelper
.
mergeAllMachines
(
report
,
ipAddress
);
if
(
report
!=
null
)
{
if
(
report
!=
null
)
{
report
=
m_mergeHelper
.
mergeAllMachines
(
report
,
ipAddress
);
model
.
setReport
(
report
);
model
.
setReport
(
report
);
buildTransactionMetaInfo
(
model
,
payload
,
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 {
...
@@ -68,7 +68,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@Override
@Override
protected
boolean
removeEldestEntry
(
Entry
<
Long
,
Pair
<
RouterConfig
,
Long
>>
eldest
)
{
protected
boolean
removeEldestEntry
(
Entry
<
Long
,
Pair
<
RouterConfig
,
Long
>>
eldest
)
{
return
size
()
>
100
;
return
size
()
>
100
;
}
}
};
};
...
@@ -98,7 +99,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
...
@@ -98,7 +99,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
@Override
@Override
public
void
initialize
()
throws
InitializationException
{
public
void
initialize
()
throws
InitializationException
{
try
{
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
();
String
content
=
config
.
getContent
();
m_configId
=
config
.
getId
();
m_configId
=
config
.
getId
();
...
@@ -143,7 +145,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
...
@@ -143,7 +145,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
}
}
public
Server
queryBackUpServer
()
{
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
()
{
public
List
<
Server
>
queryEnableServers
()
{
...
@@ -152,7 +155,9 @@ public class RouterConfigManager implements Initializable, LogEnabled {
...
@@ -152,7 +155,9 @@ public class RouterConfigManager implements Initializable, LogEnabled {
for
(
DefaultServer
server
:
servers
)
{
for
(
DefaultServer
server
:
servers
)
{
if
(
server
.
isEnable
())
{
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
;
return
result
;
...
@@ -167,11 +172,14 @@ public class RouterConfigManager implements Initializable, LogEnabled {
...
@@ -167,11 +172,14 @@ public class RouterConfigManager implements Initializable, LogEnabled {
int
length
=
servers
.
size
();
int
length
=
servers
.
size
();
int
hashCode
=
domain
.
hashCode
();
int
hashCode
=
domain
.
hashCode
();
if
(
length
>
0
)
{
for
(
int
i
=
0
;
i
<
2
;
i
++)
{
for
(
int
i
=
0
;
i
<
2
;
i
++)
{
int
index
=
Math
.
abs
((
hashCode
+
i
))
%
length
;
int
index
=
Math
.
abs
((
hashCode
+
i
))
%
length
;
addServerList
(
result
,
servers
.
get
(
index
));
addServerList
(
result
,
servers
.
get
(
index
));
}
}
}
addServerList
(
result
,
queryBackUpServer
());
addServerList
(
result
,
queryBackUpServer
());
}
else
{
}
else
{
for
(
Server
server
:
domainConfig
.
getServers
())
{
for
(
Server
server
:
domainConfig
.
getServers
())
{
...
@@ -191,18 +199,22 @@ public class RouterConfigManager implements Initializable, LogEnabled {
...
@@ -191,18 +199,22 @@ public class RouterConfigManager implements Initializable, LogEnabled {
long
time
=
period
.
getTime
();
long
time
=
period
.
getTime
();
try
{
try
{
DailyReport
report
=
m_dailyReportDao
.
findByDomainNamePeriod
(
Constants
.
CAT
,
RouterConfigBuilder
.
ID
,
period
,
DailyReport
report
=
m_dailyReportDao
.
findByDomainNamePeriod
(
Constants
.
CAT
,
RouterConfigBuilder
.
ID
,
period
,
DailyReportEntity
.
READSET_FULL
);
DailyReportEntity
.
READSET_FULL
);
long
modifyTime
=
report
.
getCreationDate
().
getTime
();
long
modifyTime
=
report
.
getCreationDate
().
getTime
();
Pair
<
RouterConfig
,
Long
>
pair
=
m_routerConfigs
.
get
(
time
);
Pair
<
RouterConfig
,
Long
>
pair
=
m_routerConfigs
.
get
(
time
);
if
(
pair
==
null
||
modifyTime
>
pair
.
getValue
())
{
if
(
pair
==
null
||
modifyTime
>
pair
.
getValue
())
{
try
{
try
{
DailyReportContent
reportContent
=
m_dailyReportContentDao
.
findByPK
(
report
.
getId
(),
DailyReportContent
reportContent
=
m_dailyReportContentDao
.
findByPK
(
report
.
getId
(),
DailyReportContentEntity
.
READSET_FULL
);
DailyReportContentEntity
.
READSET_FULL
);
RouterConfig
routerConfig
=
DefaultNativeParser
.
parse
(
reportContent
.
getContent
());
RouterConfig
routerConfig
=
DefaultNativeParser
.
parse
(
reportContent
.
getContent
());
m_routerConfigs
.
put
(
time
,
new
Pair
<
RouterConfig
,
Long
>(
routerConfig
,
modifyTime
));
m_routerConfigs
.
put
(
time
,
new
Pair
<
RouterConfig
,
Long
>(
routerConfig
,
modifyTime
));
Cat
.
logEvent
(
"ReloadConfig"
,
"router"
);
Cat
.
logEvent
(
"ReloadConfig"
,
"router"
);
}
catch
(
DalNotFoundException
e
)
{
}
catch
(
DalNotFoundException
e
)
{
// ignore
// ignore
...
@@ -217,8 +229,10 @@ public class RouterConfigManager implements Initializable, LogEnabled {
...
@@ -217,8 +229,10 @@ public class RouterConfigManager implements Initializable, LogEnabled {
}
}
}
}
private
void
refreshConfigInfo
()
throws
DalException
,
SAXException
,
IOException
{
private
void
refreshConfigInfo
()
throws
DalException
,
SAXException
,
Config
config
=
m_configDao
.
findByName
(
CONFIG_NAME
,
ConfigEntity
.
READSET_FULL
);
IOException
{
Config
config
=
m_configDao
.
findByName
(
CONFIG_NAME
,
ConfigEntity
.
READSET_FULL
);
long
modifyTime
=
config
.
getModifyDate
().
getTime
();
long
modifyTime
=
config
.
getModifyDate
().
getTime
();
synchronized
(
this
)
{
synchronized
(
this
)
{
...
...
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
738ced1b
...
@@ -2423,8 +2423,8 @@
...
@@ -2423,8 +2423,8 @@
<implementation>
com.dianping.cat.config.app.WebApiTableProvider
</implementation>
<implementation>
com.dianping.cat.config.app.WebApiTableProvider
</implementation>
</component>
</component>
<component>
<component>
<role>
org.unidal.dal.jdbc.datasource.
JdbcDataSourceDescriptorManag
er
</role>
<role>
org.unidal.dal.jdbc.datasource.
DataSourceProvid
er
</role>
<implementation>
org.unidal.dal.jdbc.datasource.
JdbcDataSourceDescriptorManag
er
</implementation>
<implementation>
org.unidal.dal.jdbc.datasource.
DefaultDataSourceProvid
er
</implementation>
<configuration>
<configuration>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
</configuration>
</configuration>
...
@@ -2434,7 +2434,6 @@
...
@@ -2434,7 +2434,6 @@
<role-hint>
alert
</role-hint>
<role-hint>
alert
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
alert
</logical-table-name>
<physical-table-name>
alert
</physical-table-name>
<physical-table-name>
alert
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2444,7 +2443,6 @@
...
@@ -2444,7 +2443,6 @@
<role-hint>
alert-summary
</role-hint>
<role-hint>
alert-summary
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
alert-summary
</logical-table-name>
<physical-table-name>
alert_summary
</physical-table-name>
<physical-table-name>
alert_summary
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2454,7 +2452,6 @@
...
@@ -2454,7 +2452,6 @@
<role-hint>
alteration
</role-hint>
<role-hint>
alteration
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
alteration
</logical-table-name>
<physical-table-name>
alteration
</physical-table-name>
<physical-table-name>
alteration
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2464,7 +2461,6 @@
...
@@ -2464,7 +2461,6 @@
<role-hint>
baseline
</role-hint>
<role-hint>
baseline
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
baseline
</logical-table-name>
<physical-table-name>
baseline
</physical-table-name>
<physical-table-name>
baseline
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2474,7 +2470,6 @@
...
@@ -2474,7 +2470,6 @@
<role-hint>
config-modification
</role-hint>
<role-hint>
config-modification
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
config-modification
</logical-table-name>
<physical-table-name>
config_modification
</physical-table-name>
<physical-table-name>
config_modification
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2484,7 +2479,6 @@
...
@@ -2484,7 +2479,6 @@
<role-hint>
overload
</role-hint>
<role-hint>
overload
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
overload
</logical-table-name>
<physical-table-name>
overload
</physical-table-name>
<physical-table-name>
overload
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2494,7 +2488,6 @@
...
@@ -2494,7 +2488,6 @@
<role-hint>
topology-graph
</role-hint>
<role-hint>
topology-graph
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
topology-graph
</logical-table-name>
<physical-table-name>
topologyGraph
</physical-table-name>
<physical-table-name>
topologyGraph
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2504,7 +2497,6 @@
...
@@ -2504,7 +2497,6 @@
<role-hint>
user-define-rule
</role-hint>
<role-hint>
user-define-rule
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
user-define-rule
</logical-table-name>
<physical-table-name>
user_define_rule
</physical-table-name>
<physical-table-name>
user_define_rule
</physical-table-name>
<data-source-name>
cat
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
...
@@ -2586,7 +2578,6 @@
...
@@ -2586,7 +2578,6 @@
<role-hint>
app-command-data
</role-hint>
<role-hint>
app-command-data
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
app-command-data
</logical-table-name>
<physical-table-name>
app_command_data
</physical-table-name>
<physical-table-name>
app_command_data
</physical-table-name>
<data-source-name>
app
</data-source-name>
<data-source-name>
app
</data-source-name>
</configuration>
</configuration>
...
@@ -2596,7 +2587,6 @@
...
@@ -2596,7 +2587,6 @@
<role-hint>
app-connection-data
</role-hint>
<role-hint>
app-connection-data
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
app-connection-data
</logical-table-name>
<physical-table-name>
app_connection_data
</physical-table-name>
<physical-table-name>
app_connection_data
</physical-table-name>
<data-source-name>
app
</data-source-name>
<data-source-name>
app
</data-source-name>
</configuration>
</configuration>
...
@@ -2606,7 +2596,6 @@
...
@@ -2606,7 +2596,6 @@
<role-hint>
app-speed-data
</role-hint>
<role-hint>
app-speed-data
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
app-speed-data
</logical-table-name>
<physical-table-name>
app_speed_data
</physical-table-name>
<physical-table-name>
app_speed_data
</physical-table-name>
<data-source-name>
app
</data-source-name>
<data-source-name>
app
</data-source-name>
</configuration>
</configuration>
...
@@ -2616,7 +2605,6 @@
...
@@ -2616,7 +2605,6 @@
<role-hint>
web-api-data
</role-hint>
<role-hint>
web-api-data
</role-hint>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<implementation>
org.unidal.dal.jdbc.mapping.SimpleTableProvider
</implementation>
<configuration>
<configuration>
<logical-table-name>
web-api-data
</logical-table-name>
<physical-table-name>
web_api_data
</physical-table-name>
<physical-table-name>
web_api_data
</physical-table-name>
<data-source-name>
app
</data-source-name>
<data-source-name>
app
</data-source-name>
</configuration>
</configuration>
...
@@ -3600,11 +3588,6 @@
...
@@ -3600,11 +3588,6 @@
<component>
<component>
<role>
com.dianping.cat.core.config.ConfigDao
</role>
<role>
com.dianping.cat.core.config.ConfigDao
</role>
<implementation>
com.dianping.cat.core.config.ConfigDao
</implementation>
<implementation>
com.dianping.cat.core.config.ConfigDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.problem.Handler
</role>
<role>
com.dianping.cat.report.page.problem.Handler
</role>
...
@@ -3653,20 +3636,10 @@
...
@@ -3653,20 +3636,10 @@
<component>
<component>
<role>
com.dianping.cat.core.dal.GraphDao
</role>
<role>
com.dianping.cat.core.dal.GraphDao
</role>
<implementation>
com.dianping.cat.core.dal.GraphDao
</implementation>
<implementation>
com.dianping.cat.core.dal.GraphDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.DailyGraphDao
</role>
<role>
com.dianping.cat.core.dal.DailyGraphDao
</role>
<implementation>
com.dianping.cat.core.dal.DailyGraphDao
</implementation>
<implementation>
com.dianping.cat.core.dal.DailyGraphDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.problem.JspViewer
</role>
<role>
com.dianping.cat.report.page.problem.JspViewer
</role>
...
@@ -3710,74 +3683,34 @@
...
@@ -3710,74 +3683,34 @@
<component>
<component>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
<role>
com.dianping.cat.core.dal.HourlyReportDao
</role>
<implementation>
com.dianping.cat.core.dal.HourlyReportDao
</implementation>
<implementation>
com.dianping.cat.core.dal.HourlyReportDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.HourlyReportContentDao
</role>
<role>
com.dianping.cat.core.dal.HourlyReportContentDao
</role>
<implementation>
com.dianping.cat.core.dal.HourlyReportContentDao
</implementation>
<implementation>
com.dianping.cat.core.dal.HourlyReportContentDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.DailyReportDao
</role>
<role>
com.dianping.cat.core.dal.DailyReportDao
</role>
<implementation>
com.dianping.cat.core.dal.DailyReportDao
</implementation>
<implementation>
com.dianping.cat.core.dal.DailyReportDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.DailyReportContentDao
</role>
<role>
com.dianping.cat.core.dal.DailyReportContentDao
</role>
<implementation>
com.dianping.cat.core.dal.DailyReportContentDao
</implementation>
<implementation>
com.dianping.cat.core.dal.DailyReportContentDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.WeeklyReportDao
</role>
<role>
com.dianping.cat.core.dal.WeeklyReportDao
</role>
<implementation>
com.dianping.cat.core.dal.WeeklyReportDao
</implementation>
<implementation>
com.dianping.cat.core.dal.WeeklyReportDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.WeeklyReportContentDao
</role>
<role>
com.dianping.cat.core.dal.WeeklyReportContentDao
</role>
<implementation>
com.dianping.cat.core.dal.WeeklyReportContentDao
</implementation>
<implementation>
com.dianping.cat.core.dal.WeeklyReportContentDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.MonthlyReportDao
</role>
<role>
com.dianping.cat.core.dal.MonthlyReportDao
</role>
<implementation>
com.dianping.cat.core.dal.MonthlyReportDao
</implementation>
<implementation>
com.dianping.cat.core.dal.MonthlyReportDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.core.dal.MonthlyReportContentDao
</role>
<role>
com.dianping.cat.core.dal.MonthlyReportContentDao
</role>
<implementation>
com.dianping.cat.core.dal.MonthlyReportContentDao
</implementation>
<implementation>
com.dianping.cat.core.dal.MonthlyReportContentDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.DomainGroupConfigManager
</role>
<role>
com.dianping.cat.report.page.DomainGroupConfigManager
</role>
...
@@ -4285,11 +4218,6 @@
...
@@ -4285,11 +4218,6 @@
<component>
<component>
<role>
com.dianping.cat.core.dal.HostinfoDao
</role>
<role>
com.dianping.cat.core.dal.HostinfoDao
</role>
<implementation>
com.dianping.cat.core.dal.HostinfoDao
</implementation>
<implementation>
com.dianping.cat.core.dal.HostinfoDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.cache.Handler
</role>
<role>
com.dianping.cat.report.page.cache.Handler
</role>
...
@@ -4539,11 +4467,6 @@
...
@@ -4539,11 +4467,6 @@
<component>
<component>
<role>
com.dianping.cat.core.dal.ProjectDao
</role>
<role>
com.dianping.cat.core.dal.ProjectDao
</role>
<implementation>
com.dianping.cat.core.dal.ProjectDao
</implementation>
<implementation>
com.dianping.cat.core.dal.ProjectDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.consumer.metric.MetricConfigManager
</role>
<role>
com.dianping.cat.consumer.metric.MetricConfigManager
</role>
...
@@ -4645,11 +4568,6 @@
...
@@ -4645,11 +4568,6 @@
<component>
<component>
<role>
com.dianping.cat.home.dal.report.TopologyGraphDao
</role>
<role>
com.dianping.cat.home.dal.report.TopologyGraphDao
</role>
<implementation>
com.dianping.cat.home.dal.report.TopologyGraphDao
</implementation>
<implementation>
com.dianping.cat.home.dal.report.TopologyGraphDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.dependency.config.TopoGraphFormatConfigManager
</role>
<role>
com.dianping.cat.report.page.dependency.config.TopoGraphFormatConfigManager
</role>
...
@@ -5016,11 +4934,6 @@
...
@@ -5016,11 +4934,6 @@
<component>
<component>
<role>
com.dianping.cat.home.dal.report.AlterationDao
</role>
<role>
com.dianping.cat.home.dal.report.AlterationDao
</role>
<implementation>
com.dianping.cat.home.dal.report.AlterationDao
</implementation>
<implementation>
com.dianping.cat.home.dal.report.AlterationDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.monitor.Handler
</role>
<role>
com.dianping.cat.report.page.monitor.Handler
</role>
...
@@ -5256,11 +5169,6 @@
...
@@ -5256,11 +5169,6 @@
<component>
<component>
<role>
com.dianping.cat.app.WebApiDataDao
</role>
<role>
com.dianping.cat.app.WebApiDataDao
</role>
<implementation>
com.dianping.cat.app.WebApiDataDao
</implementation>
<implementation>
com.dianping.cat.app.WebApiDataDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.system.Handler
</role>
<role>
com.dianping.cat.report.page.system.Handler
</role>
...
@@ -5460,11 +5368,6 @@
...
@@ -5460,11 +5368,6 @@
<component>
<component>
<role>
com.dianping.cat.app.AppCommandDataDao
</role>
<role>
com.dianping.cat.app.AppCommandDataDao
</role>
<implementation>
com.dianping.cat.app.AppCommandDataDao
</implementation>
<implementation>
com.dianping.cat.app.AppCommandDataDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.app.service.AppSpeedService
</role>
<role>
com.dianping.cat.report.page.app.service.AppSpeedService
</role>
...
@@ -5478,11 +5381,6 @@
...
@@ -5478,11 +5381,6 @@
<component>
<component>
<role>
com.dianping.cat.app.AppSpeedDataDao
</role>
<role>
com.dianping.cat.app.AppSpeedDataDao
</role>
<implementation>
com.dianping.cat.app.AppSpeedDataDao
</implementation>
<implementation>
com.dianping.cat.app.AppSpeedDataDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.app.display.AppConnectionGraphCreator
</role>
<role>
com.dianping.cat.report.page.app.display.AppConnectionGraphCreator
</role>
...
@@ -5511,11 +5409,6 @@
...
@@ -5511,11 +5409,6 @@
<component>
<component>
<role>
com.dianping.cat.app.AppConnectionDataDao
</role>
<role>
com.dianping.cat.app.AppConnectionDataDao
</role>
<implementation>
com.dianping.cat.app.AppConnectionDataDao
</implementation>
<implementation>
com.dianping.cat.app.AppConnectionDataDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.alert.app.AppRuleConfigManager
</role>
<role>
com.dianping.cat.report.alert.app.AppRuleConfigManager
</role>
...
@@ -5544,11 +5437,6 @@
...
@@ -5544,11 +5437,6 @@
<component>
<component>
<role>
com.dianping.cat.home.dal.report.UserDefineRuleDao
</role>
<role>
com.dianping.cat.home.dal.report.UserDefineRuleDao
</role>
<implementation>
com.dianping.cat.home.dal.report.UserDefineRuleDao
</implementation>
<implementation>
com.dianping.cat.home.dal.report.UserDefineRuleDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.app.processor.CrashLogProcessor
</role>
<role>
com.dianping.cat.report.page.app.processor.CrashLogProcessor
</role>
...
@@ -5627,11 +5515,6 @@
...
@@ -5627,11 +5515,6 @@
<component>
<component>
<role>
com.dianping.cat.home.dal.report.AlertDao
</role>
<role>
com.dianping.cat.home.dal.report.AlertDao
</role>
<implementation>
com.dianping.cat.home.dal.report.AlertDao
</implementation>
<implementation>
com.dianping.cat.home.dal.report.AlertDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.overload.Handler
</role>
<role>
com.dianping.cat.report.page.overload.Handler
</role>
...
@@ -5678,11 +5561,6 @@
...
@@ -5678,11 +5561,6 @@
<component>
<component>
<role>
com.dianping.cat.home.dal.report.OverloadDao
</role>
<role>
com.dianping.cat.home.dal.report.OverloadDao
</role>
<implementation>
com.dianping.cat.home.dal.report.OverloadDao
</implementation>
<implementation>
com.dianping.cat.home.dal.report.OverloadDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.report.page.database.Handler
</role>
<role>
com.dianping.cat.report.page.database.Handler
</role>
...
@@ -6732,11 +6610,6 @@
...
@@ -6732,11 +6610,6 @@
<component>
<component>
<role>
com.dianping.cat.home.dal.report.ConfigModificationDao
</role>
<role>
com.dianping.cat.home.dal.report.ConfigModificationDao
</role>
<implementation>
com.dianping.cat.home.dal.report.ConfigModificationDao
</implementation>
<implementation>
com.dianping.cat.home.dal.report.ConfigModificationDao
</implementation>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.QueryEngine
</role>
</requirement>
</requirements>
</component>
</component>
<component>
<component>
<role>
com.dianping.cat.system.page.plugin.Handler
</role>
<role>
com.dianping.cat.system.page.plugin.Handler
</role>
...
...
cat-maven-plugin/pom.xml
浏览文件 @
738ced1b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
parent
</artifactId>
<artifactId>
parent
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-maven-plugin
</artifactId>
<artifactId>
cat-maven-plugin
</artifactId>
...
...
pom.xml
浏览文件 @
738ced1b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
parent
</artifactId>
<artifactId>
parent
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
<name>
parent
</name>
<name>
parent
</name>
<description>
Central Application Tracking
</description>
<description>
Central Application Tracking
</description>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
...
@@ -46,22 +46,22 @@
...
@@ -46,22 +46,22 @@
<dependency>
<dependency>
<groupId>
org.unidal.framework
</groupId>
<groupId>
org.unidal.framework
</groupId>
<artifactId>
dal-jdbc
</artifactId>
<artifactId>
dal-jdbc
</artifactId>
<version>
2.
2.0
</version>
<version>
2.
3.3
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.unidal.framework
</groupId>
<groupId>
org.unidal.framework
</groupId>
<artifactId>
foundation-service
</artifactId>
<artifactId>
foundation-service
</artifactId>
<version>
2.
2
.0
</version>
<version>
2.
3
.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.unidal.framework
</groupId>
<groupId>
org.unidal.framework
</groupId>
<artifactId>
web-framework
</artifactId>
<artifactId>
web-framework
</artifactId>
<version>
2.
2.1
</version>
<version>
2.
3.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.unidal.framework
</groupId>
<groupId>
org.unidal.framework
</groupId>
<artifactId>
test-framework
</artifactId>
<artifactId>
test-framework
</artifactId>
<version>
2.
2
.0
</version>
<version>
2.
3
.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.unidal.webres
</groupId>
<groupId>
org.unidal.webres
</groupId>
...
@@ -181,17 +181,17 @@ org.eclipse.jdt.core.compiler.compliance=1.6
...
@@ -181,17 +181,17 @@ org.eclipse.jdt.core.compiler.compliance=1.6
<plugin>
<plugin>
<groupId>
org.unidal.maven.plugins
</groupId>
<groupId>
org.unidal.maven.plugins
</groupId>
<artifactId>
codegen-maven-plugin
</artifactId>
<artifactId>
codegen-maven-plugin
</artifactId>
<version>
2.
1.3
</version>
<version>
2.
3.2
</version>
</plugin>
</plugin>
<plugin>
<plugin>
<groupId>
org.unidal.maven.plugins
</groupId>
<groupId>
org.unidal.maven.plugins
</groupId>
<artifactId>
plexus-maven-plugin
</artifactId>
<artifactId>
plexus-maven-plugin
</artifactId>
<version>
2.
1.2
</version>
<version>
2.
2.0
</version>
</plugin>
</plugin>
<plugin>
<plugin>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
cat-maven-plugin
</artifactId>
<artifactId>
cat-maven-plugin
</artifactId>
<version>
1.3.6
-SNAPSHOT
</version>
<version>
1.3.6
</version>
</plugin>
</plugin>
</plugins>
</plugins>
</pluginManagement>
</pluginManagement>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录