apply new webres framework

cat-home/pom.xml

@@ -28,7 +28,7 @@
 			<artifactId>web-framework</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.ebay.webres</groupId>
+			<groupId>org.unidal.webres</groupId>
 			<artifactId>WebResServer</artifactId>
 		</dependency>
 		<dependency>

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

@@ -4,13 +4,15 @@ import java.io.File;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.ebay.webres.resource.runtime.ResourceConfigurator;
-import com.ebay.webres.resource.runtime.ResourceInitializer;
-import com.ebay.webres.resource.runtime.ResourceRuntime;
-import com.ebay.webres.resource.runtime.ResourceRuntimeContext;
-import com.ebay.webres.resource.spi.IResourceRegistry;
-import com.ebay.webres.tag.resource.ResourceTagConfigurator;
-import com.ebay.webres.taglib.basic.ResourceTagLibConfigurator;
+
+import org.unidal.webres.resource.runtime.ResourceConfigurator;
+import org.unidal.webres.resource.runtime.ResourceInitializer;
+import org.unidal.webres.resource.runtime.ResourceRuntime;
+import org.unidal.webres.resource.runtime.ResourceRuntimeContext;
+import org.unidal.webres.resource.spi.IResourceRegistry;
+import org.unidal.webres.tag.resource.ResourceTagConfigurator;
+import org.unidal.webres.taglib.basic.ResourceTagLibConfigurator;
+
 import com.site.web.mvc.Action;
 import com.site.web.mvc.ActionContext;
 import com.site.web.mvc.ActionPayload;

cat-home/src/main/java/com/dianping/cat/report/page/logview/Handler.java

@@ -5,10 +5,11 @@ import java.io.IOException;
 
 import javax.servlet.ServletException;
 
+import org.unidal.webres.helper.Files;
+import org.unidal.webres.helper.Joiners;
+
 import com.dianping.cat.message.spi.MessagePathBuilder;
 import com.dianping.cat.report.ReportPage;
-import com.ebay.webres.helper.Files;
-import com.ebay.webres.helper.Joiners;
 import com.site.lookup.annotation.Inject;
 import com.site.web.mvc.PageHandler;
 import com.site.web.mvc.annotation.InboundActionMeta;

cat-home/src/main/webapp/WEB-INF/tags/body.tag

 <%@ tag trimDirectiveWhitespaces="true" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="res" uri="http://www.ebay.com/webres"%>
+<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
 <jsp:useBean id="navBar" class="com.dianping.garden.view.NavigationBar" scope="page"/>
 
 <res:bean id="res"/>

cat-home/src/main/webapp/WEB-INF/tags/report.tag

 <%@ tag trimDirectiveWhitespaces="true" %>
 <%@ taglib prefix="a" uri="/WEB-INF/app.tld"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="res" uri="http://www.ebay.com/webres"%>
+<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
 <%@ attribute name="title"%>
 <%@ attribute name="timestamp"%>
 <%@ attribute name="domain" fragment="true"%>

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

@@ -2,11 +2,11 @@
 <description>JSP standard tag library for V4 resources</description>
 <tlib-version>1.0</tlib-version>
 <short-name>res</short-name>
-<uri>http://www.ebay.com/webres</uri>
+<uri>http://www.unidal.org/webres</uri>
 <tag>
 <description><![CDATA[jsSlot Resource Tag]]></description>
 <name>jsSlot</name>
-<tag-class>com.ebay.webres.taglib.basic.JsSlotTagHandler</tag-class>
+<tag-class>org.unidal.webres.taglib.basic.JsSlotTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
 <description><![CDATA[Identify whether the link URL is secure or not.]]></description>
@@ -34,7 +34,7 @@
 <tag>
 <description><![CDATA[Resource Bean Tag to define resource bean variable as bootstrap]]></description>
 <name>bean</name>
-<tag-class>com.ebay.webres.taglib.basic.BeanTagHandler</tag-class>
+<tag-class>org.unidal.webres.taglib.basic.BeanTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
 <description><![CDATA[A valid id for Bean.]]></description>
@@ -48,7 +48,7 @@
 <tag>
 <description><![CDATA[useCss Resource Tag]]></description>
 <name>useCss</name>
-<tag-class>com.ebay.webres.taglib.basic.UseCssTagHandler</tag-class>
+<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>
@@ -90,7 +90,7 @@
 <tag>
 <description><![CDATA[Resource token tag for page resources]]></description>
 <name>token</name>
-<tag-class>com.ebay.webres.taglib.basic.TokenTagHandler</tag-class>
+<tag-class>org.unidal.webres.taglib.basic.TokenTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
 <description><![CDATA[Customized tag render type]]></description>
@@ -111,7 +111,7 @@
 <tag>
 <description><![CDATA[Set tag to define a page attribute with id as name]]></description>
 <name>set</name>
-<tag-class>com.ebay.webres.taglib.basic.SetTagHandler</tag-class>
+<tag-class>org.unidal.webres.taglib.basic.SetTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
 <description><![CDATA[The value]]></description>
@@ -132,7 +132,7 @@
 <tag>
 <description><![CDATA[useJs Resource Tag]]></description>
 <name>useJs</name>
-<tag-class>com.ebay.webres.taglib.basic.UseJsTagHandler</tag-class>
+<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>
@@ -174,7 +174,7 @@
 <tag>
 <description><![CDATA[Link Resource Tag]]></description>
 <name>link</name>
-<tag-class>com.ebay.webres.taglib.basic.LinkTagHandler</tag-class>
+<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>
@@ -202,7 +202,7 @@
 <tag>
 <description><![CDATA[Image Resource Tag]]></description>
 <name>img</name>
-<tag-class>com.ebay.webres.taglib.basic.ImageTagHandler</tag-class>
+<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>
@@ -237,7 +237,7 @@
 <tag>
 <description><![CDATA[cssSlot Resource Tag]]></description>
 <name>cssSlot</name>
-<tag-class>com.ebay.webres.taglib.basic.CssSlotTagHandler</tag-class>
+<tag-class>org.unidal.webres.taglib.basic.CssSlotTagHandler</tag-class>
 <body-content>JSP</body-content>
 <attribute>
 <description><![CDATA[Identify whether the link URL is secure or not.]]></description>

cat-home/src/main/webapp/jsp/report/failure.jsp

 <%@ page contentType="text/html; charset=utf-8"%>
 <%@ taglib prefix="a" uri="/WEB-INF/app.tld"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="res" uri="http://www.ebay.com/webres"%>
+<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
 <jsp:useBean id="ctx" type="com.dianping.cat.report.page.failure.Context" scope="request" />
 <jsp:useBean id="payload" type="com.dianping.cat.report.page.failure.Payload" scope="request" />
 <jsp:useBean id="model" type="com.dianping.cat.report.page.failure.Model" scope="request" />

cat-home/src/main/webapp/jsp/report/ip.jsp

 <%@ page contentType="text/html; charset=utf-8" trimDirectiveWhitespaces="true"%>
 <%@ taglib prefix="a" uri="/WEB-INF/app.tld"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="res" uri="http://www.ebay.com/webres"%>
+<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
 <jsp:useBean id="ctx" type="com.dianping.cat.report.page.ip.Context" scope="request" />
 <jsp:useBean id="payload" type="com.dianping.cat.report.page.ip.Payload" scope="request" />
 <jsp:useBean id="model" type="com.dianping.cat.report.page.ip.Model" scope="request" />

cat-home/src/main/webapp/jsp/report/logview.jsp

 <%@ page contentType="text/html; charset=utf-8" %>
 <%@ taglib prefix="a" uri="/WEB-INF/app.tld"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="res" uri="http://www.ebay.com/webres"%>
+<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
 <jsp:useBean id="ctx" type="com.dianping.cat.report.page.logview.Context" scope="request"/>
 <jsp:useBean id="payload" type="com.dianping.cat.report.page.logview.Payload" scope="request"/>
 <jsp:useBean id="model" type="com.dianping.cat.report.page.logview.Model" scope="request"/>

cat-home/src/main/webapp/jsp/report/transaction.jsp

 <%@ page contentType="text/html; charset=utf-8"%>
 <%@ taglib prefix="a" uri="/WEB-INF/app.tld"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="res" uri="http://www.ebay.com/webres"%>
+<%@ taglib prefix="res" uri="http://www.unidal.org/webres"%>
 <jsp:useBean id="ctx"
 	type="com.dianping.cat.report.page.transaction.Context" scope="request" />
 <jsp:useBean id="payload"

cat-home/src/test/java/com/dianping/cat/SimpleServer.java

@@ -11,10 +11,10 @@ import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.servlet.GzipFilter;
+import org.unidal.webres.server.support.SimpleServerSupport;
+import org.unidal.webres.taglib.support.JettyTestSupport;
 
 import com.dianping.cat.servlet.CatServlet;
-import com.ebay.webres.server.support.SimpleServerSupport;
-import com.ebay.webres.taglib.support.JettyTestSupport;
 import com.site.lookup.ComponentTestCase;
 import com.site.test.browser.BrowserManager;
 import com.site.web.MVC;

pom.xml

@@ -51,9 +51,9 @@
             <version>1.0.0-a3</version>
          </dependency>
          <dependency>
-            <groupId>com.ebay.webres</groupId>
+            <groupId>org.unidal.webres</groupId>
             <artifactId>WebResServer</artifactId>
-            <version>1.1.15</version>
+            <version>1.2.0</version>
          </dependency>
          <dependency>
             <groupId>com.site.dal</groupId>