diff --git a/cat-core/src/main/java/com/dianping/cat/servlet/CatFilter.java b/cat-core/src/main/java/com/dianping/cat/servlet/CatFilter.java index 1f9b3529bd614831953c4bb2627410d72da66b83..e7579a3dac17b3b5532ee4a61f0d2f36e1ae0fd5 100644 --- a/cat-core/src/main/java/com/dianping/cat/servlet/CatFilter.java +++ b/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(); } } diff --git a/cat-core/src/test/java/META-INF/MANIFEST.MF b/cat-core/src/test/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000000000000000000000000000000000..254272e1c0740423e25eb40be9a98ce1556474b1 --- /dev/null +++ b/cat-core/src/test/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/cat-home/src/main/webapp/WEB-INF/webres.tld b/cat-home/src/main/webapp/WEB-INF/webres.tld index 10cbffaa9b412bdf76a66780a51361340ba31890..908d2e5f2dbdb8844fcdfff120f8337d17348dfd 100644 --- a/cat-home/src/main/webapp/WEB-INF/webres.tld +++ b/cat-home/src/main/webapp/WEB-INF/webres.tld @@ -51,13 +51,6 @@ org.unidal.webres.taglib.basic.UseCssTagHandler JSP - -value -false -true -java.lang.Object - - secure false @@ -79,6 +72,13 @@ java.lang.String + +value +false +true +java.lang.Object + + target false @@ -114,18 +114,18 @@ org.unidal.webres.taglib.basic.SetTagHandler JSP - -value + +id true true -java.lang.Object +java.lang.String - -id + +value true true -java.lang.String +java.lang.Object false @@ -135,13 +135,6 @@ org.unidal.webres.taglib.basic.UseJsTagHandler JSP - -value -false -true -java.lang.Object - - secure false @@ -163,6 +156,13 @@ java.lang.String + +value +false +true +java.lang.Object + + target false @@ -177,13 +177,6 @@ org.unidal.webres.taglib.basic.LinkTagHandler JSP - -value -true -true -java.lang.Object - - secure false @@ -197,6 +190,13 @@ true java.lang.String + + +value +true +true +java.lang.Object + true @@ -205,13 +205,6 @@ org.unidal.webres.taglib.basic.ImageTagHandler JSP - -value -true -true -java.lang.Object - - secure false @@ -232,6 +225,13 @@ true java.lang.String + + +value +true +true +java.lang.Object + true