gregw 2004/02/02 19:46:44 Modified: modules/jetty project.xml modules/jetty/src/etc/META-INF geronimo-service.xml modules/console-web/src/webapp faq.jsp index.jsp mbeanInfo.jsp modules/console-web/src/webapp/WEB-INF geronimo_jmx-console_v0-1.tld web.xml Log: Changes to use JSP2.0 (jasper from 5.0.16) "fixed" console TLD descriptors to work. Revision Changes Path 1.11 +22 -4 incubator-geronimo/modules/jetty/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/jetty/project.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- project.xml 31 Jan 2004 19:27:17 -0000 1.10 +++ project.xml 3 Feb 2004 03:46:44 -0000 1.11 @@ -148,11 +148,10 @@ - tomcat jasper-compiler - 4.0.4 + 5.0.16 true @@ -161,7 +160,26 @@ tomcat jasper-runtime - 4.0.4 + 5.0.16 + + true + + + + + commons-el + commons-el + 1.0 + http://jakarta.apache.org/commons/el/ + + true + + + + + ant + ant + 1.5 true 1.6 +5 -3 incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml Index: geronimo-service.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geronimo-service.xml 29 Jan 2004 22:42:47 -0000 1.5 +++ geronimo-service.xml 3 Feb 2004 03:46:44 -0000 1.6 @@ -4,8 +4,10 @@ org.mortbay.jetty-5.0.beta0.jar geronimo-spec-servlet-DEV.jar geronimo-spec-jsp-DEV.jar - jasper-compiler-4.0.4.jar - jasper-runtime-4.0.4.jar + jasper-compiler-5.0.16.jar + jasper-runtime-5.0.16.jar + commons-el-1.0.jar + ant-1.5.jar @@ -18,4 +20,4 @@ - \ No newline at end of file + 1.4 +1 -1 incubator-geronimo/modules/console-web/src/webapp/faq.jsp Index: faq.jsp =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/console-web/src/webapp/faq.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- faq.jsp 7 Dec 2003 04:02:34 -0000 1.3 +++ faq.jsp 3 Feb 2004 03:46:44 -0000 1.4 @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html" session="false" %> -<%@ taglib uri="/WEB-INF/geronimo_jmx-console_v0-1.tld" prefix="jmx" %> +<%@ taglib uri="http://geronimo.apache.org/tlds/geronimo_jmx-console_v0-1.tld" prefix="jmx" %> 1.4 +1 -1 incubator-geronimo/modules/console-web/src/webapp/index.jsp Index: index.jsp =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/console-web/src/webapp/index.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.jsp 7 Dec 2003 04:02:34 -0000 1.3 +++ index.jsp 3 Feb 2004 03:46:44 -0000 1.4 @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html" session="false" %> -<%@ taglib uri="/WEB-INF/geronimo_jmx-console_v0-1.tld" prefix="jmx" %> +<%@ taglib uri="http://geronimo.apache.org/tlds/geronimo_jmx-console_v0-1.tld" prefix="jmx" %> 1.4 +1 -1 incubator-geronimo/modules/console-web/src/webapp/mbeanInfo.jsp Index: mbeanInfo.jsp =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/console-web/src/webapp/mbeanInfo.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mbeanInfo.jsp 7 Dec 2003 04:02:34 -0000 1.3 +++ mbeanInfo.jsp 3 Feb 2004 03:46:44 -0000 1.4 @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html" session="false" %> -<%@ taglib uri="/WEB-INF/geronimo_jmx-console_v0-1.tld" prefix="jmx" %> +<%@ taglib uri="http://geronimo.apache.org/tlds/geronimo_jmx-console_v0-1.tld" prefix="jmx" %> 1.3 +12 -11 incubator-geronimo/modules/console-web/src/webapp/WEB-INF/geronimo_jmx-console_v0-1.tld Index: geronimo_jmx-console_v0-1.tld =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/console-web/src/webapp/WEB-INF/geronimo_jmx-console_v0-1.tld,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geronimo_jmx-console_v0-1.tld 22 Oct 2003 18:06:24 -0000 1.2 +++ geronimo_jmx-console_v0-1.tld 3 Feb 2004 03:46:44 -0000 1.3 @@ -1,30 +1,32 @@ - - + + - 0.1 - 1.2 - console-web + 1.0 + 1.2 + console-web http://geronimo.apache.org/tlds/geronimo_jmx-console_v0-1.tld MBeanServerContents - org.apache.geronimo.console.web.taglib.MBeanServerContentsTag + org.apache.geronimo.console.web.taglib.MBeanServerContentsTag MBeanServerContext - org.apache.geronimo.console.web.taglib.MBeanServerContextTag + org.apache.geronimo.console.web.taglib.MBeanServerContextTag ClearFilter - org.apache.geronimo.console.web.taglib.ClearFilterTag + org.apache.geronimo.console.web.taglib.ClearFilterTag MBeanServerContextValue - org.apache.geronimo.console.web.taglib.MBeanServerContextValueTag + org.apache.geronimo.console.web.taglib.MBeanServerContextValueTag type @@ -35,7 +37,6 @@ MBeanAttributes - org.apache.geronimo.console.web.taglib.MBeanAttributesTag + org.apache.geronimo.console.web.taglib.MBeanAttributesTag - 1.3 +12 -9 incubator-geronimo/modules/console-web/src/webapp/WEB-INF/web.xml Index: web.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/console-web/src/webapp/WEB-INF/web.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- web.xml 22 Oct 2003 18:06:24 -0000 1.2 +++ web.xml 3 Feb 2004 03:46:44 -0000 1.3 @@ -1,16 +1,19 @@ - - - - + + index.jsp - - console-web - /WEB-INF/lib/jmx-console-servlet.jar - + + + http://geronimo.apache.org/tlds/geronimo_jmx-console_v0-1.tld + /WEB-INF/geronimo_jmx-console_v0-1.tld + + - \ No newline at end of file +