Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
65c1e88d
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,发现更多精彩内容 >>
提交
65c1e88d
编写于
10月 28, 2014
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #581 from youyong205/master
modify the version
上级
35812fb7
ff33bee1
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
17 addition
and
11 deletion
+17
-11
cat-agent/pom.xml
cat-agent/pom.xml
+1
-1
cat-broker/pom.xml
cat-broker/pom.xml
+1
-1
cat-client/pom.xml
cat-client/pom.xml
+1
-1
cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java
...ent/src/main/java/com/dianping/cat/servlet/CatFilter.java
+2
-0
cat-consumer-advanced/pom.xml
cat-consumer-advanced/pom.xml
+1
-1
cat-consumer/pom.xml
cat-consumer/pom.xml
+1
-1
cat-core/pom.xml
cat-core/pom.xml
+1
-1
cat-hadoop/pom.xml
cat-hadoop/pom.xml
+1
-1
cat-home/pom.xml
cat-home/pom.xml
+1
-1
cat-home/src/main/webapp/css/body.css
cat-home/src/main/webapp/css/body.css
+4
-0
cat-maven-plugin/pom.xml
cat-maven-plugin/pom.xml
+1
-1
pom.xml
pom.xml
+2
-2
未找到文件。
cat-agent/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-agent
</artifactId>
<artifactId>
cat-agent
</artifactId>
...
...
cat-broker/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
broker-service
</artifactId>
<artifactId>
broker-service
</artifactId>
...
...
cat-client/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-client
</artifactId>
<artifactId>
cat-client
</artifactId>
...
...
cat-client/src/main/java/com/dianping/cat/servlet/CatFilter.java
浏览文件 @
65c1e88d
...
@@ -272,6 +272,7 @@ public class CatFilter implements Filter {
...
@@ -272,6 +272,7 @@ public class CatFilter implements Filter {
private
void
customizeStatus
(
Transaction
t
,
HttpServletRequest
req
)
{
private
void
customizeStatus
(
Transaction
t
,
HttpServletRequest
req
)
{
Object
catStatus
=
req
.
getAttribute
(
CatConstants
.
CAT_STATE
);
Object
catStatus
=
req
.
getAttribute
(
CatConstants
.
CAT_STATE
);
if
(
catStatus
!=
null
)
{
if
(
catStatus
!=
null
)
{
t
.
setStatus
(
catStatus
.
toString
());
t
.
setStatus
(
catStatus
.
toString
());
}
else
{
}
else
{
...
@@ -281,6 +282,7 @@ public class CatFilter implements Filter {
...
@@ -281,6 +282,7 @@ public class CatFilter implements Filter {
private
void
customizeUri
(
Transaction
t
,
HttpServletRequest
req
)
{
private
void
customizeUri
(
Transaction
t
,
HttpServletRequest
req
)
{
Object
catPageUri
=
req
.
getAttribute
(
CatConstants
.
CAT_PAGE_URI
);
Object
catPageUri
=
req
.
getAttribute
(
CatConstants
.
CAT_PAGE_URI
);
if
(
t
instanceof
DefaultTransaction
&&
catPageUri
instanceof
String
)
{
if
(
t
instanceof
DefaultTransaction
&&
catPageUri
instanceof
String
)
{
((
DefaultTransaction
)
t
).
setName
(
catPageUri
.
toString
());
((
DefaultTransaction
)
t
).
setName
(
catPageUri
.
toString
());
}
}
...
...
cat-consumer-advanced/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-consumer-advanced
</artifactId>
<artifactId>
cat-consumer-advanced
</artifactId>
...
...
cat-consumer/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-consumer
</artifactId>
<artifactId>
cat-consumer
</artifactId>
...
...
cat-core/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cat-core
</artifactId>
<artifactId>
cat-core
</artifactId>
...
...
cat-hadoop/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</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
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</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/webapp/css/body.css
浏览文件 @
65c1e88d
...
@@ -270,4 +270,8 @@ ul, ol{
...
@@ -270,4 +270,8 @@ ul, ol{
}
}
.aleration_workflow
{
.aleration_workflow
{
background
:
#87CEEB
;
background
:
#87CEEB
;
}
.table-condensed
th
,
.table-condensed
td
{
padding
:
2px
3px
;
vertical-align
:
middle
;
}
}
\ No newline at end of file
cat-maven-plugin/pom.xml
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</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
浏览文件 @
65c1e88d
...
@@ -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.1.
3
</version>
<version>
1.1.
4
</version>
<name>
parent
</name>
<name>
parent
</name>
<description>
Central Application Tracking
</description>
<description>
Central Application Tracking
</description>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
...
@@ -179,7 +179,7 @@ org.eclipse.jdt.core.compiler.compliance=1.6
...
@@ -179,7 +179,7 @@ org.eclipse.jdt.core.compiler.compliance=1.6
<plugin>
<plugin>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
cat-maven-plugin
</artifactId>
<artifactId>
cat-maven-plugin
</artifactId>
<version>
1.1.
3
</version>
<version>
1.1.
4
</version>
</plugin>
</plugin>
</plugins>
</plugins>
</build>
</build>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录