 wenshao
|
853b3ac262
|
0.2.6
0.2.6
|
2012-09-02 14:42:15 +08:00 |
|
 温高铁
|
eebfc6b142
|
Merge pull request #139 from zhanming/master
clean webWppStatSet at setUp method
|
2012-09-01 04:05:08 -07:00 |
|
 Zhanming Qi
|
19a210f69c
|
Merge branch 'master' of https://github.com/zhanming/druid.git
|
2012-09-01 19:02:00 +08:00 |
|
|
Zhanming Qi
|
aa8941a8a7
|
clean webWppStatSet at setUp
|
2012-09-01 18:59:40 +08:00 |
|
|
温高铁
|
8a7d21b008
|
Merge pull request #138 from zhanming/master
change resetAll to setUp, before every method, need resetAll.
|
2012-09-01 02:54:38 -07:00 |
|
|
Zhanming Qi
|
ec3bdaccff
|
Merge remote-tracking branch 'upstream/master'
|
2012-09-01 16:14:41 +08:00 |
|
|
Zhanming Qi
|
6fc2dd8bc2
|
add multiple data source test case.
|
2012-09-01 16:10:54 +08:00 |
|
|
Zhanming Qi
|
1e33fad5b0
|
change resetAll to setUp, before every method, need resetAll.
|
2012-09-01 16:10:23 +08:00 |
|
|
温高铁
|
f3c0f3d749
|
Merge pull request #137 from wenshao/master
重构ConfigFilter
|
2012-08-31 21:00:45 -07:00 |
|
|
wenshao
|
864a883c2c
|
refactor ConfigFilter
|
2012-09-01 11:58:38 +08:00 |
|
|
温高铁
|
ab61ef339d
|
Merge pull request #136 from zhanming/master
add test case for DruidStatService, remove useless jetty config file.
|
2012-08-31 19:50:33 -07:00 |
|
|
Zhanming Qi
|
0c134ab6e0
|
remove jetty config
|
2012-09-01 10:41:33 +08:00 |
|
|
Zhanming Qi
|
42e24680d2
|
add test case for DruidStatService
|
2012-09-01 10:41:13 +08:00 |
|
|
wenshao
|
7a77a70fbe
|
fixed test
|
2012-09-01 09:11:32 +08:00 |
|
|
温高铁
|
70d07acbd8
|
Merge pull request #135 from wenshao/master
重构ConfigFilter
|
2012-08-31 18:03:37 -07:00 |
|
|
wenshao
|
6a99fe1c6e
|
refactor ConfigFilter
|
2012-09-01 09:02:10 +08:00 |
|
|
wenshao
|
eaf0ccb80b
|
refactor ConfigFilter
|
2012-09-01 09:01:59 +08:00 |
|
|
wenshao
|
b0a519e44f
|
refactor ConfigFilter
|
2012-09-01 07:51:29 +08:00 |
|
|
wenshao
|
f7be377c79
|
refactor ConfigFilter, remove ConfigLoader
|
2012-08-31 22:14:40 +08:00 |
|
|
wenshao
|
f9279bac88
|
refactor ConfigFilter, remove ConfigLoader
|
2012-08-31 22:09:25 +08:00 |
|
|
温高铁
|
f10b040a69
|
Merge pull request #134 from wenshao/master
重构ConfigFilter相关的testcase
|
2012-08-31 06:52:23 -07:00 |
|
|
wenshao
|
b2e42115df
|
refactor testcase
|
2012-08-31 21:49:41 +08:00 |
|
|
wenshao
|
fd440a2fcf
|
Merge remote-tracking branch 'upstream/master'
|
2012-08-31 21:43:39 +08:00 |
|
|
wenshao
|
1201a525d1
|
revmoe failed testcase
|
2012-08-31 21:40:20 +08:00 |
|
|
温高铁
|
7244c3a1d6
|
Merge pull request #133 from wenshao/master
删除跑不过的testcase
|
2012-08-31 06:39:13 -07:00 |
|
|
wenshao
|
d8a4c8fdfc
|
revmoe failed testcase
|
2012-08-31 21:38:14 +08:00 |
|
|
温高铁
|
e274009585
|
Merge pull request #132 from wenshao/master
add license info
|
2012-08-31 06:16:25 -07:00 |
|
|
wenshao
|
d9084ef164
|
add license
|
2012-08-31 21:15:20 +08:00 |
|
|
温高铁
|
8641079f57
|
Merge pull request #131 from xiaoyu830411/master
加解密和加载远程文件
|
2012-08-31 04:57:24 -07:00 |
|
|
温高铁
|
a5324f4086
|
Merge pull request #130 from zhanming/master
fix web page javascript number, and some bug.
|
2012-08-31 04:56:50 -07:00 |
|
 xiaoyu830411
|
056303ae5a
|
Encrypt and Decrypt tool, and load remote config file
|
2012-08-31 16:59:51 +08:00 |
|
|
温高铁
|
88908b5f25
|
Merge pull request #129 from xiaoyu830411/master
加解密和加载远程文件
|
2012-08-31 00:50:34 -07:00 |
|
|
xiaoyu830411
|
e19def644d
|
Encrypt tool and Decrypt
|
2012-08-31 13:57:44 +08:00 |
|
|
Zhanming Qi
|
eeca2c324d
|
修复逻辑问题。
|
2012-08-31 13:14:46 +08:00 |
|
|
Zhanming Qi
|
89e1c97722
|
强制转型，int转为long
|
2012-08-31 13:13:58 +08:00 |
|
|
Zhanming Qi
|
3c09168867
|
修复显示详情是的nav高亮显示
|
2012-08-31 13:09:49 +08:00 |
|
|
xiaoyu830411
|
6290be2561
|
Merge remote-tracking branch 'upstream/master'
|
2012-08-31 12:59:13 +08:00 |
|
|
xiaoyu830411
|
56d125d4d6
|
Encypt tool and Decrypt
|
2012-08-31 12:58:55 +08:00 |
|
|
温高铁
|
93e1d56a70
|
Merge pull request #128 from shrekwang/master
去除System.out.println 直接调用
|
2012-08-30 21:15:10 -07:00 |
|
 shrek.wang
|
aff235f513
|
refactor code, remove direct 'System.out.println' call
|
2012-08-31 09:51:45 +08:00 |
|
|
温高铁
|
41b5766199
|
Merge pull request #127 from wenshao/master
修改将Stat注册到SystemProperties的缺省值，使用spring-test代替spring-mock
|
2012-08-30 16:09:49 -07:00 |
|
|
wenshao
|
fe0f67bf45
|
change register to system properties option, default false
|
2012-08-31 06:53:34 +08:00 |
|
|
wenshao
|
0f77080b36
|
use spring-test instead spring-mock
|
2012-08-30 20:13:43 +08:00 |
|
|
xiaoyu830411
|
d7b39faf74
|
Merge remote-tracking branch 'upstream/master'
|
2012-08-30 16:22:19 +08:00 |
|
|
温高铁
|
f5fde8f9a6
|
Merge pull request #126 from wenshao/master
修复HADataSource相关的testcase问题。
|
2012-08-29 20:00:08 -07:00 |
|
|
温高铁
|
3e92f3cece
|
Merge pull request #125 from shrekwang/master
修复druid中没有执行sql, 命令行工具出null point错误的问题
|
2012-08-29 19:59:27 -07:00 |
|
|
wenshao
|
7eb6fedb63
|
HADataSource add testcase & bug fixed
|
2012-08-30 10:58:07 +08:00 |
|
|
shrek.wang
|
7c043a0440
|
add -Dfile.encoding system property in command line arguments
|
2012-08-30 10:53:52 +08:00 |
|
|
shrek.wang
|
2b83a532e4
|
add DruidStatNullDataTest testcase
|
2012-08-30 10:52:56 +08:00 |
|
|
shrek.wang
|
5b2de72f6c
|
fixes nullpoint problem if no sqlstat data when execute cmd tool
|
2012-08-30 10:52:22 +08:00 |
|