Merge branch 'master' of ssh://192.168.8.22:58422/cat

33adba80 · Frankie Wu · 1eac7b41 · b496a9cc · 33adba80 · 33adba80
152 changed file
--- a/cat-home/pom.xml
+++ b/cat-home/pom.xml
--- a/cat-home/src/main/java/com/dianping/cat/Server.java
+++ b/cat-home/src/main/java/com/dianping/cat/Server.java
--- a/cat-home/src/main/java/com/dianping/cat/report/ReportContext.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/ReportContext.java
--- a/cat-home/src/main/java/com/dianping/cat/report/ReportModule.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/ReportModule.java
--- a/cat-home/src/main/java/com/dianping/cat/report/ReportPage.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/ReportPage.java
--- a/cat-home/src/main/java/com/dianping/cat/report/build/ComponentsConfigurator.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/build/ComponentsConfigurator.java
--- a/cat-home/src/main/java/com/dianping/cat/report/build/ServiceComponentConfigurator.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/build/ServiceComponentConfigurator.java
--- a/cat-home/src/main/java/com/dianping/cat/report/build/WebComponentConfigurator.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/build/WebComponentConfigurator.java
--- a/cat-home/src/main/java/com/dianping/cat/report/graph/AbstractGraphPayload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/graph/AbstractGraphPayload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/graph/DefaultGraphBuilder.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/graph/DefaultGraphBuilder.java
--- a/cat-home/src/main/java/com/dianping/cat/report/graph/DefaultValueTranslater.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/graph/DefaultValueTranslater.java
--- a/cat-home/src/main/java/com/dianping/cat/report/graph/GraphBuilder.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/graph/GraphBuilder.java
--- a/cat-home/src/main/java/com/dianping/cat/report/graph/GraphPayload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/graph/GraphPayload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/graph/ValueTranslater.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/graph/ValueTranslater.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportModel.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportModel.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportPayload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportPayload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/home/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/home/Action.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/home/Context.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/home/Context.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/home/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/home/Handler.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/home/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/home/JspFile.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/home/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/home/JspViewer.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/home/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/home/Model.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/home/Payload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/home/Payload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/ip/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/ip/Action.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/ip/Context.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/ip/Context.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/ip/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/ip/Handler.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/ip/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/ip/JspFile.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/ip/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/ip/JspViewer.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/ip/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/ip/Model.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/ip/Payload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/ip/Payload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Action.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Context.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Context.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspFile.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/JspViewer.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Model.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/logview/Payload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/logview/Payload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/Action.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/Context.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/Context.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/Handler.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/JspFile.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/JspViewer.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/Model.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/Payload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/Payload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/CompositeIpService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/CompositeIpService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/IpReportMerger.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/IpReportMerger.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/LocalIpService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/LocalIpService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/RemoteIpService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/ip/RemoteIpService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/CompositeLogViewService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/CompositeLogViewService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/HdfsLogViewService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/HdfsLogViewService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/LocalLogViewService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/LocalLogViewService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/RemoteLogViewService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/RemoteLogViewService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/CompositeProblemService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/CompositeProblemService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/HdfsProblemService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/HdfsProblemService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/LocalProblemService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/LocalProblemService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/RemoteProblemService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/RemoteProblemService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelPeriod.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelPeriod.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelRequest.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelRequest.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelResponse.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelResponse.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/spi/ModelService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/CompositeTransactionService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/CompositeTransactionService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/HdfsTransactionService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/HdfsTransactionService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/LocalTransactionService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/LocalTransactionService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/RemoteTransactionModelService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/RemoteTransactionModelService.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/TransactionReportMerger.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/TransactionReportMerger.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Action.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Context.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Context.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Handler.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspFile.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/JspViewer.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Model.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/problem/Payload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/problem/Payload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Action.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Context.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Context.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Handler.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/JspFile.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/JspViewer.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Model.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/Payload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/Payload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlGraphPayload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlGraphPayload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlReport.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlReport.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlReportModel.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/sql/SqlReportModel.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Action.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Action.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Context.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Context.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspFile.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspFile.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspViewer.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/JspViewer.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Model.java
--- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Payload.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Payload.java
--- a/cat-home/src/main/java/com/dianping/cat/report/view/ErrorsTag.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/view/ErrorsTag.java
--- a/cat-home/src/main/java/com/dianping/cat/report/view/NavigationBar.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/view/NavigationBar.java
--- a/cat-home/src/main/java/com/dianping/cat/report/view/ProblemReportHelper.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/view/ProblemReportHelper.java
--- a/cat-home/src/main/java/com/dianping/cat/report/view/UriBuilder.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/view/UriBuilder.java
--- a/cat-home/src/main/java/com/dianping/cat/report/view/UrlNav.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/view/UrlNav.java
--- a/cat-home/src/main/java/com/dianping/cat/servlet/CatServlet.java
+++ b/cat-home/src/main/java/com/dianping/cat/servlet/CatServlet.java
--- a/cat-home/src/main/resources/META-INF/MANIFEST.MF
+++ b/cat-home/src/main/resources/META-INF/MANIFEST.MF
--- a/cat-home/src/main/resources/META-INF/cat/client.xml
+++ b/cat-home/src/main/resources/META-INF/cat/client.xml
--- a/cat-home/src/main/resources/META-INF/cat/config.xsd
+++ b/cat-home/src/main/resources/META-INF/cat/config.xsd
--- a/cat-home/src/main/resources/META-INF/cat/server.xml
+++ b/cat-home/src/main/resources/META-INF/cat/server.xml
--- a/cat-home/src/main/resources/META-INF/plexus/components.xml
+++ b/cat-home/src/main/resources/META-INF/plexus/components.xml
--- a/cat-home/src/main/resources/META-INF/wizard/webapp/manifest.xml
+++ b/cat-home/src/main/resources/META-INF/wizard/webapp/manifest.xml
--- a/cat-home/src/main/resources/META-INF/wizard/webapp/wizard.xml
+++ b/cat-home/src/main/resources/META-INF/wizard/webapp/wizard.xml
--- a/cat-home/src/main/webapp/WEB-INF/app.tld
+++ b/cat-home/src/main/webapp/WEB-INF/app.tld
--- a/cat-home/src/main/webapp/WEB-INF/tags/body.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/body.tag
--- a/cat-home/src/main/webapp/WEB-INF/tags/report.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/report.tag
--- a/cat-home/src/main/webapp/WEB-INF/web.xml
+++ b/cat-home/src/main/webapp/WEB-INF/web.xml
--- a/cat-home/src/main/webapp/WEB-INF/webres.tld
+++ b/cat-home/src/main/webapp/WEB-INF/webres.tld
--- a/cat-home/src/main/webapp/css/body.css
+++ b/cat-home/src/main/webapp/css/body.css
--- a/cat-home/src/main/webapp/css/ip.css
+++ b/cat-home/src/main/webapp/css/ip.css
--- a/cat-home/src/main/webapp/css/logview.css
+++ b/cat-home/src/main/webapp/css/logview.css
--- a/cat-home/src/main/webapp/css/problem.css
+++ b/cat-home/src/main/webapp/css/problem.css
--- a/cat-home/src/main/webapp/css/report.css
+++ b/cat-home/src/main/webapp/css/report.css
--- a/cat-home/src/main/webapp/css/transaction.css
+++ b/cat-home/src/main/webapp/css/transaction.css
--- a/cat-home/src/main/webapp/js/jquery-1.7.1.js
+++ b/cat-home/src/main/webapp/js/jquery-1.7.1.js
--- a/cat-home/src/main/webapp/js/logview.js
+++ b/cat-home/src/main/webapp/js/logview.js
--- a/cat-home/src/main/webapp/js/problem.js
+++ b/cat-home/src/main/webapp/js/problem.js
--- a/cat-home/src/main/webapp/js/sql.js
+++ b/cat-home/src/main/webapp/js/sql.js
--- a/cat-home/src/main/webapp/js/transaction.js
+++ b/cat-home/src/main/webapp/js/transaction.js
--- a/cat-home/src/main/webapp/jsp/report/home.jsp
+++ b/cat-home/src/main/webapp/jsp/report/home.jsp
--- a/cat-home/src/main/webapp/jsp/report/ip.jsp
+++ b/cat-home/src/main/webapp/jsp/report/ip.jsp
--- a/cat-home/src/main/webapp/jsp/report/logview.jsp
+++ b/cat-home/src/main/webapp/jsp/report/logview.jsp
--- a/cat-home/src/main/webapp/jsp/report/logview_no_header.jsp
+++ b/cat-home/src/main/webapp/jsp/report/logview_no_header.jsp
--- a/cat-home/src/main/webapp/jsp/report/model.jsp
+++ b/cat-home/src/main/webapp/jsp/report/model.jsp
--- a/cat-home/src/main/webapp/jsp/report/problem.jsp
+++ b/cat-home/src/main/webapp/jsp/report/problem.jsp
--- a/cat-home/src/main/webapp/jsp/report/sql.jsp
+++ b/cat-home/src/main/webapp/jsp/report/sql.jsp
--- a/cat-home/src/main/webapp/jsp/report/sql_graph.jsp
+++ b/cat-home/src/main/webapp/jsp/report/sql_graph.jsp
--- a/cat-home/src/main/webapp/jsp/report/sql_graphs.jsp
+++ b/cat-home/src/main/webapp/jsp/report/sql_graphs.jsp
--- a/cat-home/src/main/webapp/jsp/report/transaction.jsp
+++ b/cat-home/src/main/webapp/jsp/report/transaction.jsp
--- a/cat-home/src/main/webapp/jsp/report/transaction_graph.jsp
+++ b/cat-home/src/main/webapp/jsp/report/transaction_graph.jsp
--- a/cat-home/src/main/webapp/jsp/report/transaction_graphs.jsp
+++ b/cat-home/src/main/webapp/jsp/report/transaction_graphs.jsp
--- a/cat-home/src/test/intg/com/dianping/cat/AllAllTests.java
+++ b/cat-home/src/test/intg/com/dianping/cat/AllAllTests.java
--- a/cat-home/src/test/java/com/dianping/cat/AllTests.java
+++ b/cat-home/src/test/java/com/dianping/cat/AllTests.java
--- a/cat-home/src/test/java/com/dianping/cat/TestServer.java
+++ b/cat-home/src/test/java/com/dianping/cat/TestServer.java
--- a/cat-home/src/test/java/com/dianping/cat/demo/Demo.java
+++ b/cat-home/src/test/java/com/dianping/cat/demo/Demo.java
--- a/cat-home/src/test/java/com/dianping/cat/report/graph/ValueTranslaterTest.java
+++ b/cat-home/src/test/java/com/dianping/cat/report/graph/ValueTranslaterTest.java
--- a/cat-home/src/test/java/com/dianping/cat/report/page/ip/DisplayModelTest.java
+++ b/cat-home/src/test/java/com/dianping/cat/report/page/ip/DisplayModelTest.java
--- a/cat-home/src/test/java/com/dianping/cat/report/page/model/transaction/TransactionModelServiceTest.java
+++ b/cat-home/src/test/java/com/dianping/cat/report/page/model/transaction/TransactionModelServiceTest.java
--- a/cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java
+++ b/cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java
--- a/cat-home/src/test/java/com/dianping/cat/report/page/transaction/TransactionReportMergerTest.java
+++ b/cat-home/src/test/java/com/dianping/cat/report/page/transaction/TransactionReportMergerTest.java
--- a/cat-home/src/test/resources/com/dianping/cat/demo/client.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/demo/client.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportMergeResult.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportMergeResult.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportNew.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportNew.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportOld.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportOld.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/tool/FailureReportMergeResult.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/tool/FailureReportMergeResult.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/tool/FailureReportNew.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/tool/FailureReportNew.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/tool/FailureReportOld.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/tool/FailureReportOld.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/tool/IpReportMergeResult.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/tool/IpReportMergeResult.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/tool/IpReportNew.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/tool/IpReportNew.xml
--- a/cat-home/src/test/resources/com/dianping/cat/report/tool/IpReportOld.xml
+++ b/cat-home/src/test/resources/com/dianping/cat/report/tool/IpReportOld.xml
--- a/cat-job/src/main/java/com/dianping/cat/job/hdfs/DefaultInputChannelManager.java
+++ b/cat-job/src/main/java/com/dianping/cat/job/hdfs/DefaultInputChannelManager.java
--- a/cat-job/src/main/java/com/dianping/cat/job/hdfs/DefaultOutputChannelManager.java
+++ b/cat-job/src/main/java/com/dianping/cat/job/hdfs/DefaultOutputChannelManager.java
--- a/cat-job/src/main/resources/META-INF/plexus/components.xml
+++ b/cat-job/src/main/resources/META-INF/plexus/components.xml