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

cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java

@@ -179,8 +179,8 @@ public class FailureReportAnalyzer extends AbstractMessageAnalyzer<FailureReport
 			}
 		}
 		oldSegments.clear();
-		for (String key : newSegments.keySet()) {
-			oldSegments.put(key, newSegments.get(key));
+		for (java.util.Map.Entry<String, Segment> entry : newSegments.entrySet()) {
+			oldSegments.put(entry.getKey(), newSegments.get(entry.getValue()));
 		}
 		return m_report;
 	}

cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportAnalyzer.java

@@ -222,8 +222,6 @@ public class TransactionReportAnalyzer extends AbstractMessageAnalyzer<Transacti
 
 	@Override
 	protected void process(MessageTree tree) {
-		//TO delete it , it should be delete after test
-		messageStorage.store(tree);
 		String domain = tree.getDomain();
 		TransactionReport report = this.m_reports.get(domain);
 		if (report == null) {

cat-core/src/main/java/com/dianping/cat/servlet/CatFilter.java

@@ -28,7 +28,6 @@ public abstract class CatFilter implements Filter {
 		String sessionToken = req.getSession().getId();
 		// setup for thread local data
 		Cat.setup(sessionToken);
-		System.out.println("----------------Cat Filter init----------------");
 		MessageProducer cat = Cat.getProducer();
 		Transaction t = cat.newTransaction("URL", req.getRequestURI());
 
@@ -40,21 +39,15 @@ public abstract class CatFilter implements Filter {
 			chain.doFilter(request, response);
 		} catch (ServletException e) {
 			t.setStatus(e);
-
 			throw e;
 		} catch (IOException e) {
 			t.setStatus(e);
-
 			throw e;
 		} catch (RuntimeException e) {
 			t.setStatus(e);
-
 			throw e;
 		} finally {
 			t.complete();
-
-			System.out.println("----------------Cat Filter End----------------");
-			// reset thread local data
 			Cat.reset();
 		}
 	}

cat-core/src/test/java/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Class-Path: 
+

cat-home/src/main/java/com/dianping/cat/report/ReportManager.java

@@ -47,8 +47,6 @@ public abstract class ReportManager {
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}
-		} else {
-			inputStart = DateUtils.SDF_URL.format(currentHourStart);
 		}
 
 		long reportStart = startLong + changeValue * DateUtils.HOUR;

cat-home/src/main/java/com/dianping/cat/report/page/service/provider/TransactionModelProvider.java

@@ -51,8 +51,13 @@ public class TransactionModelProvider implements ModelProvider {
 		} else {
 			System.err.println("historical model is not implemented yet");
 		}
+		TransactionReport report;
 		
-		TransactionReport report = analyzer.generate(domain);
+		if (analyzer == null) {
+			report = new TransactionReport(domain);
+		} else {
+			report = analyzer.generate(domain);
+		}
 		return new DefaultXmlBuilder().buildXml(report);
 	}
 

cat-home/src/main/webapp/WEB-INF/webres.tld

@@ -51,13 +51,6 @@
 <tag-class>org.unidal.webres.taglib.basic.UseCssTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
-<description><![CDATA[Set the css value with EL or a css ref.]]></description>
-<name>value</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-<type>java.lang.Object</type>
-</attribute>
-<attribute>
 <description><![CDATA[Identify whether the link URL is secure or not.]]></description>
 <name>secure</name>
 <required>false</required>
@@ -79,6 +72,13 @@
 <type>java.lang.String</type>
 </attribute>
 <attribute>
+<description><![CDATA[Set the css value with EL or a css ref.]]></description>
+<name>value</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+<type>java.lang.Object</type>
+</attribute>
+<attribute>
 <description><![CDATA[Target placement for this css resource to render]]></description>
 <name>target</name>
 <required>false</required>
@@ -114,18 +114,18 @@
 <tag-class>org.unidal.webres.taglib.basic.SetTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
-<description><![CDATA[The value]]></description>
-<name>value</name>
+<description><![CDATA[The name.]]></description>
+<name>id</name>
 <required>true</required>
 <rtexprvalue>true</rtexprvalue>
-<type>java.lang.Object</type>
+<type>java.lang.String</type>
 </attribute>
 <attribute>
-<description><![CDATA[The name.]]></description>
-<name>id</name>
+<description><![CDATA[The value]]></description>
+<name>value</name>
 <required>true</required>
 <rtexprvalue>true</rtexprvalue>
-<type>java.lang.String</type>
+<type>java.lang.Object</type>
 </attribute>
 <dynamic-attributes>false</dynamic-attributes>
 </tag>
@@ -135,13 +135,6 @@
 <tag-class>org.unidal.webres.taglib.basic.UseJsTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
-<description><![CDATA[Set the js value with EL or a js ref.]]></description>
-<name>value</name>
-<required>false</required>
-<rtexprvalue>true</rtexprvalue>
-<type>java.lang.Object</type>
-</attribute>
-<attribute>
 <description><![CDATA[Identify whether the link URL is secure or not.]]></description>
 <name>secure</name>
 <required>false</required>
@@ -163,6 +156,13 @@
 <type>java.lang.String</type>
 </attribute>
 <attribute>
+<description><![CDATA[Set the js value with EL or a js ref.]]></description>
+<name>value</name>
+<required>false</required>
+<rtexprvalue>true</rtexprvalue>
+<type>java.lang.Object</type>
+</attribute>
+<attribute>
 <description><![CDATA[Target placement for this js resource to render]]></description>
 <name>target</name>
 <required>false</required>
@@ -177,13 +177,6 @@
 <tag-class>org.unidal.webres.taglib.basic.LinkTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
-<description><![CDATA[The value for link, could be a expression or a link ref.]]></description>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-<type>java.lang.Object</type>
-</attribute>
-<attribute>
 <description><![CDATA[Identify whether the link URL is secure or not.]]></description>
 <name>secure</name>
 <required>false</required>
@@ -197,6 +190,13 @@
 <rtexprvalue>true</rtexprvalue>
 <type>java.lang.String</type>
 </attribute>
+<attribute>
+<description><![CDATA[The value for link, could be a expression or a link ref.]]></description>
+<name>value</name>
+<required>true</required>
+<rtexprvalue>true</rtexprvalue>
+<type>java.lang.Object</type>
+</attribute>
 <dynamic-attributes>true</dynamic-attributes>
 </tag>
 <tag>
@@ -205,13 +205,6 @@
 <tag-class>org.unidal.webres.taglib.basic.ImageTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
-<description><![CDATA[The value for image, could be a expression or a image path.]]></description>
-<name>value</name>
-<required>true</required>
-<rtexprvalue>true</rtexprvalue>
-<type>java.lang.Object</type>
-</attribute>
-<attribute>
 <description><![CDATA[Identify whether the image URL is secure or not.]]></description>
 <name>secure</name>
 <required>false</required>
@@ -232,6 +225,13 @@
 <rtexprvalue>true</rtexprvalue>
 <type>java.lang.String</type>
 </attribute>
+<attribute>
+<description><![CDATA[The value for image, could be a expression or a image path.]]></description>
+<name>value</name>
+<required>true</required>
+<rtexprvalue>true</rtexprvalue>
+<type>java.lang.Object</type>
+</attribute>
 <dynamic-attributes>true</dynamic-attributes>
 </tag>
 <tag>