diff --git a/cat-core/src/main/java/com/dianping/cat/Cat.java b/cat-core/src/main/java/com/dianping/cat/Cat.java
index 00b828849c0322891de4fd635361c173dff02506..917a26463dc8c65e1c24301844ba9940dcab95cb 100644
--- a/cat-core/src/main/java/com/dianping/cat/Cat.java
+++ b/cat-core/src/main/java/com/dianping/cat/Cat.java
@@ -137,7 +137,10 @@ public class Cat {
// this should be called when a thread starts to create some thread local
// data
public static void setup(String sessionToken) {
- getInstance().m_manager.setup();
+ MessageManager manager = getInstance().m_manager;
+
+ manager.setup();
+ manager.getThreadLocalMessageTree().setSessionToken(sessionToken);
}
void setContainer(PlexusContainer container) {
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 fd43e84de55cc8d7730b2715cc1f0afd7c6108cb..cfb8cf05bbec0024cc1ce66f892e02cf707a348d 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,7 @@ public abstract class CatFilter implements Filter {
String sessionToken = req.getSession().getId();
// setup for thread local data
Cat.setup(sessionToken);
-
+
MessageProducer cat = Cat.getProducer();
Transaction t = cat.newTransaction("URL", req.getRequestURI());
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