Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
47f550b9
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,发现更多精彩内容 >>
提交
47f550b9
编写于
6月 14, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the datasource config
上级
af09c51e
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
13 addition
and
71 deletion
+13
-71
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/DomainManager.java
...rc/main/java/com/dianping/cat/consumer/DomainManager.java
+4
-2
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/build/CatAdvancedDatabaseConfigurator.java
...g/cat/consumer/build/CatAdvancedDatabaseConfigurator.java
+0
-3
cat-consumer-advanced/src/main/resources/META-INF/plexus/components.xml
...dvanced/src/main/resources/META-INF/plexus/components.xml
+0
-31
cat-consumer-advanced/src/main/resources/META-INF/wizard/jdbc/wizard.xml
...vanced/src/main/resources/META-INF/wizard/jdbc/wizard.xml
+1
-1
cat-consumer/src/main/java/com/dianping/cat/consumer/build/CatCoreDatabaseConfigurator.java
...nping/cat/consumer/build/CatCoreDatabaseConfigurator.java
+2
-4
cat-consumer/src/main/resources/META-INF/plexus/components.xml
...onsumer/src/main/resources/META-INF/plexus/components.xml
+5
-29
cat-consumer/src/main/resources/META-INF/wizard/jdbc/wizard.xml
...nsumer/src/main/resources/META-INF/wizard/jdbc/wizard.xml
+1
-1
未找到文件。
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/DomainManager.java
浏览文件 @
47f550b9
...
@@ -67,8 +67,10 @@ public class DomainManager implements Initializable, LogEnabled {
...
@@ -67,8 +67,10 @@ public class DomainManager implements Initializable, LogEnabled {
project
=
m_cmdbs
.
get
(
ip
);
project
=
m_cmdbs
.
get
(
ip
);
if
(
project
==
null
)
{
if
(
project
==
null
)
{
m_unknownIps
.
put
(
ip
,
ip
);
if
(!
m_unknownIps
.
containsKey
(
ip
))
{
m_logger
.
info
(
"add ip to unknown list,ip:"
+
ip
);
m_logger
.
info
(
"add ip to unknown list,ip:"
+
ip
);
m_unknownIps
.
put
(
ip
,
ip
);
}
return
UNKNOWN_PROJECT
;
return
UNKNOWN_PROJECT
;
}
}
}
}
...
...
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/build/CatAdvancedDatabaseConfigurator.java
浏览文件 @
47f550b9
...
@@ -11,9 +11,6 @@ final class CatAdvancedDatabaseConfigurator extends AbstractJdbcResourceConfigur
...
@@ -11,9 +11,6 @@ final class CatAdvancedDatabaseConfigurator extends AbstractJdbcResourceConfigur
public
List
<
Component
>
defineComponents
()
{
public
List
<
Component
>
defineComponents
()
{
List
<
Component
>
all
=
new
ArrayList
<
Component
>();
List
<
Component
>
all
=
new
ArrayList
<
Component
>();
all
.
add
(
defineJdbcDataSourceConfigurationManagerComponent
(
"datasources.xml"
));
all
.
add
(
defineJdbcDataSourceComponent
(
"cat"
,
"com.mysql.jdbc.Driver"
,
"jdbc:mysql://192.168.7.43:3306/cat"
,
"dpcom_cat"
,
"password"
,
"<![CDATA[useUnicode=true&autoReconnect=true]]>"
));
defineSimpleTableProviderComponents
(
all
,
"cat"
,
com
.
dianping
.
cat
.
consumer
.
advanced
.
dal
.
_INDEX
.
getEntityClasses
());
defineSimpleTableProviderComponents
(
all
,
"cat"
,
com
.
dianping
.
cat
.
consumer
.
advanced
.
dal
.
_INDEX
.
getEntityClasses
());
defineDaoComponents
(
all
,
com
.
dianping
.
cat
.
consumer
.
advanced
.
dal
.
_INDEX
.
getDaoClasses
());
defineDaoComponents
(
all
,
com
.
dianping
.
cat
.
consumer
.
advanced
.
dal
.
_INDEX
.
getDaoClasses
());
...
...
cat-consumer-advanced/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
47f550b9
...
@@ -149,37 +149,6 @@
...
@@ -149,37 +149,6 @@
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
</configuration>
</configuration>
</component>
</component>
<component>
<role>
org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager
</role>
<implementation>
org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager
</implementation>
<configuration>
<datasourceFile>
datasources.xml
</datasourceFile>
</configuration>
</component>
<component>
<role>
org.unidal.dal.jdbc.datasource.DataSource
</role>
<role-hint>
cat
</role-hint>
<implementation>
org.unidal.dal.jdbc.datasource.JdbcDataSource
</implementation>
<configuration>
<id>
cat
</id>
<maximum-pool-size>
3
</maximum-pool-size>
<connection-timeout>
1s
</connection-timeout>
<idle-timeout>
10m
</idle-timeout>
<statement-cache-size>
1000
</statement-cache-size>
<properties>
<driver>
com.mysql.jdbc.Driver
</driver>
<URL>
jdbc:mysql://192.168.7.43:3306/cat
</URL>
<user>
dpcom_cat
</user>
<password>
password
</password>
<connectionProperties>
<![CDATA[useUnicode=true&autoReconnect=true]]>
</connectionProperties>
</properties>
</configuration>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager
</role>
</requirement>
</requirements>
</component>
<component>
<component>
<role>
org.unidal.dal.jdbc.mapping.TableProvider
</role>
<role>
org.unidal.dal.jdbc.mapping.TableProvider
</role>
<role-hint>
business-report
</role-hint>
<role-hint>
business-report
</role-hint>
...
...
cat-consumer-advanced/src/main/resources/META-INF/wizard/jdbc/wizard.xml
浏览文件 @
47f550b9
<wizard
package=
"com.dianping.cat.consumer"
>
<wizard
package=
"com.dianping.cat.consumer"
>
<jdbc
package=
"com.dainping.cat.consumer.dal"
name=
"
CatAdvanced
"
>
<jdbc
package=
"com.dainping.cat.consumer.dal"
name=
"
cat
"
>
<datasource>
<datasource>
<driver>
com.mysql.jdbc.Driver
</driver>
<driver>
com.mysql.jdbc.Driver
</driver>
<url>
jdbc:mysql://192.168.7.43:3306/cat
</url>
<url>
jdbc:mysql://192.168.7.43:3306/cat
</url>
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/build/CatCoreDatabaseConfigurator.java
浏览文件 @
47f550b9
...
@@ -11,12 +11,10 @@ final class CatCoreDatabaseConfigurator extends AbstractJdbcResourceConfigurator
...
@@ -11,12 +11,10 @@ final class CatCoreDatabaseConfigurator extends AbstractJdbcResourceConfigurator
public
List
<
Component
>
defineComponents
()
{
public
List
<
Component
>
defineComponents
()
{
List
<
Component
>
all
=
new
ArrayList
<
Component
>();
List
<
Component
>
all
=
new
ArrayList
<
Component
>();
all
.
add
(
defineJdbcDataSourceComponent
(
"CatCore"
,
"com.mysql.jdbc.Driver"
,
"jdbc:mysql://192.168.7.43:3306/cat"
,
"dpcom_cat"
,
"password"
,
"<![CDATA[useUnicode=true&autoReconnect=true]]>"
));
defineSimpleTableProviderComponents
(
all
,
"cat"
,
com
.
dianping
.
cat
.
consumer
.
core
.
config
.
_INDEX
.
getEntityClasses
());
defineSimpleTableProviderComponents
(
all
,
"CatCore"
,
com
.
dianping
.
cat
.
consumer
.
core
.
config
.
_INDEX
.
getEntityClasses
());
defineDaoComponents
(
all
,
com
.
dianping
.
cat
.
consumer
.
core
.
config
.
_INDEX
.
getDaoClasses
());
defineDaoComponents
(
all
,
com
.
dianping
.
cat
.
consumer
.
core
.
config
.
_INDEX
.
getDaoClasses
());
defineSimpleTableProviderComponents
(
all
,
"
CatCore
"
,
com
.
dianping
.
cat
.
consumer
.
core
.
dal
.
_INDEX
.
getEntityClasses
());
defineSimpleTableProviderComponents
(
all
,
"
cat
"
,
com
.
dianping
.
cat
.
consumer
.
core
.
dal
.
_INDEX
.
getEntityClasses
());
defineDaoComponents
(
all
,
com
.
dianping
.
cat
.
consumer
.
core
.
dal
.
_INDEX
.
getDaoClasses
());
defineDaoComponents
(
all
,
com
.
dianping
.
cat
.
consumer
.
core
.
dal
.
_INDEX
.
getDaoClasses
());
return
all
;
return
all
;
...
...
cat-consumer/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
47f550b9
...
@@ -207,30 +207,6 @@
...
@@ -207,30 +207,6 @@
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
<datasourceFile>
/data/appdatas/cat/datasources.xml
</datasourceFile>
</configuration>
</configuration>
</component>
</component>
<component>
<role>
org.unidal.dal.jdbc.datasource.DataSource
</role>
<role-hint>
CatCore
</role-hint>
<implementation>
org.unidal.dal.jdbc.datasource.JdbcDataSource
</implementation>
<configuration>
<id>
CatCore
</id>
<maximum-pool-size>
3
</maximum-pool-size>
<connection-timeout>
1s
</connection-timeout>
<idle-timeout>
10m
</idle-timeout>
<statement-cache-size>
1000
</statement-cache-size>
<properties>
<driver>
com.mysql.jdbc.Driver
</driver>
<URL>
jdbc:mysql://192.168.7.43:3306/cat
</URL>
<user>
dpcom_cat
</user>
<password>
password
</password>
<connectionProperties>
<![CDATA[useUnicode=true&autoReconnect=true]]>
</connectionProperties>
</properties>
</configuration>
<requirements>
<requirement>
<role>
org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager
</role>
</requirement>
</requirements>
</component>
<component>
<component>
<role>
org.unidal.dal.jdbc.mapping.TableProvider
</role>
<role>
org.unidal.dal.jdbc.mapping.TableProvider
</role>
<role-hint>
config
</role-hint>
<role-hint>
config
</role-hint>
...
@@ -238,7 +214,7 @@
...
@@ -238,7 +214,7 @@
<configuration>
<configuration>
<logical-table-name>
config
</logical-table-name>
<logical-table-name>
config
</logical-table-name>
<physical-table-name>
config
</physical-table-name>
<physical-table-name>
config
</physical-table-name>
<data-source-name>
CatCore
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
</component>
</component>
<component>
<component>
...
@@ -257,7 +233,7 @@
...
@@ -257,7 +233,7 @@
<configuration>
<configuration>
<logical-table-name>
hostinfo
</logical-table-name>
<logical-table-name>
hostinfo
</logical-table-name>
<physical-table-name>
hostinfo
</physical-table-name>
<physical-table-name>
hostinfo
</physical-table-name>
<data-source-name>
CatCore
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
</component>
</component>
<component>
<component>
...
@@ -267,7 +243,7 @@
...
@@ -267,7 +243,7 @@
<configuration>
<configuration>
<logical-table-name>
project
</logical-table-name>
<logical-table-name>
project
</logical-table-name>
<physical-table-name>
project
</physical-table-name>
<physical-table-name>
project
</physical-table-name>
<data-source-name>
CatCore
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
</component>
</component>
<component>
<component>
...
@@ -277,7 +253,7 @@
...
@@ -277,7 +253,7 @@
<configuration>
<configuration>
<logical-table-name>
report
</logical-table-name>
<logical-table-name>
report
</logical-table-name>
<physical-table-name>
report
</physical-table-name>
<physical-table-name>
report
</physical-table-name>
<data-source-name>
CatCore
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
</component>
</component>
<component>
<component>
...
@@ -287,7 +263,7 @@
...
@@ -287,7 +263,7 @@
<configuration>
<configuration>
<logical-table-name>
task
</logical-table-name>
<logical-table-name>
task
</logical-table-name>
<physical-table-name>
task
</physical-table-name>
<physical-table-name>
task
</physical-table-name>
<data-source-name>
CatCore
</data-source-name>
<data-source-name>
cat
</data-source-name>
</configuration>
</configuration>
</component>
</component>
<component>
<component>
...
...
cat-consumer/src/main/resources/META-INF/wizard/jdbc/wizard.xml
浏览文件 @
47f550b9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<wizard
package=
"com.dianping.cat.consumer"
>
<wizard
package=
"com.dianping.cat.consumer"
>
<jdbc
package=
"com.dainping.cat.consumer.dal"
name=
"
CatCore
"
>
<jdbc
package=
"com.dainping.cat.consumer.dal"
name=
"
cat
"
>
<datasource>
<datasource>
<driver>
com.mysql.jdbc.Driver
</driver>
<driver>
com.mysql.jdbc.Driver
</driver>
<url>
jdbc:mysql://192.168.7.43:3306/cat
</url>
<url>
jdbc:mysql://192.168.7.43:3306/cat
</url>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录