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 @@
</properties>
</dependency>
-
<dependency>
<id>tomcat</id>
<artifactId>jasper-compiler</artifactId>
- <version>4.0.4</version>
+ <version>5.0.16</version>
<properties>
<package>true</package>
</properties>
@@ -161,7 +160,26 @@
<dependency>
<id>tomcat</id>
<artifactId>jasper-runtime</artifactId>
- <version>4.0.4</version>
+ <version>5.0.16</version>
+ <properties>
+ <package>true</package>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>commons-el</id>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/el/</url>
+ <properties>
+ <package>true</package>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>ant</id>
+ <artifactId>ant</artifactId>
+ <version>1.5</version>
<properties>
<package>true</package>
</properties>
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 @@
<path>org.mortbay.jetty-5.0.beta0.jar</path>
<path>geronimo-spec-servlet-DEV.jar</path>
<path>geronimo-spec-jsp-DEV.jar</path>
- <path>jasper-compiler-4.0.4.jar</path>
- <path>jasper-runtime-4.0.4.jar</path>
+ <path>jasper-compiler-5.0.16.jar</path>
+ <path>jasper-runtime-5.0.16.jar</path>
+ <path>commons-el-1.0.jar</path>
+ <path>ant-1.5.jar</path>
<gbean class="org.apache.geronimo.jetty.JettyContainerImpl"
objectName="geronimo.web:type=WebContainer,container=Jetty">
</gbean>
@@ -18,4 +20,4 @@
<!-- <default attribute="MaxConnections" type="int">10</default>-->
<!-- <default attribute="MaxIdleTime" type="int">10</default>-->
</gbean>
-</gbeans>
\ No newline at end of file
+</gbeans>
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" %>
<html>
<head>
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" %>
<html>
<head>
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" %>
<html>
<head>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library
1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib
+ PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd";>
<taglib>
- <tlibversion>0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>console-web</shortname>
+ <tlib-version>1.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>console-web</short-name>
<uri>http://geronimo.apache.org/tlds/geronimo_jmx-console_v0-1.tld</uri>
<tag>
<name>MBeanServerContents</name>
-
<tagclass>org.apache.geronimo.console.web.taglib.MBeanServerContentsTag</tagclass>
+
<tag-class>org.apache.geronimo.console.web.taglib.MBeanServerContentsTag</tag-class>
</tag>
<tag>
<name>MBeanServerContext</name>
-
<tagclass>org.apache.geronimo.console.web.taglib.MBeanServerContextTag</tagclass>
+
<tag-class>org.apache.geronimo.console.web.taglib.MBeanServerContextTag</tag-class>
</tag>
<tag>
<name>ClearFilter</name>
-
<tagclass>org.apache.geronimo.console.web.taglib.ClearFilterTag</tagclass>
+
<tag-class>org.apache.geronimo.console.web.taglib.ClearFilterTag</tag-class>
</tag>
<tag>
<name>MBeanServerContextValue</name>
-
<tagclass>org.apache.geronimo.console.web.taglib.MBeanServerContextValueTag</tagclass>
+
<tag-class>org.apache.geronimo.console.web.taglib.MBeanServerContextValueTag</tag-class>
<attribute>
<name>type</name>
@@ -35,7 +37,6 @@
<tag>
<name>MBeanAttributes</name>
-
<tagclass>org.apache.geronimo.console.web.taglib.MBeanAttributesTag</tagclass>
+
<tag-class>org.apache.geronimo.console.web.taglib.MBeanAttributesTag</tag-class>
</tag>
-
</taglib>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
-
-<web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+ version="2.4">
<!-- Welcome File List -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
- <taglib>
- <taglib-uri>console-web</taglib-uri>
-
<taglib-location>/WEB-INF/lib/jmx-console-servlet.jar</taglib-location>
- </taglib>
+ <jsp-config>
+ <taglib>
+
<taglib-uri>http://geronimo.apache.org/tlds/geronimo_jmx-console_v0-1.tld</taglib-uri>
+
<taglib-location>/WEB-INF/geronimo_jmx-console_v0-1.tld</taglib-location>
+ </taglib>
+ </jsp-config>
-</web-app>
\ No newline at end of file
+</web-app>
