Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14052/xdoclet/modules/web/src/xdoclet/modules/web
Modified Files:
JspTaglibSubTask.java WebXmlSubTask.java
Log Message:
Patch from XDT-457 by Jörg Prante to support more of JSP 2.0.
Index: JspTaglibSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/JspTaglibSubTask.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** JspTaglibSubTask.java 10 Oct 2004 22:06:51 -0000 1.14
--- JspTaglibSubTask.java 16 Jan 2005 11:41:55 -0000 1.15
***************
*** 31,42 ****
--- 31,49 ----
private static String DEFAULT_TEMPLATE_FILE = "resources/taglib_tld.xdt";
+ private static String TLD_PUBLICID_2_0 =
"http://java.sun.com/xml/ns/j2ee";;
+ // xmlns attribute
+
private static String TLD_PUBLICID_1_2 = "-//Sun Microsystems, Inc.//DTD
JSP Tag Library 1.2//EN";
private static String TLD_PUBLICID_1_1 = "-//Sun Microsystems, Inc.//DTD
JSP Tag Library 1.1//EN";
+ private static String TLD_SYSTEMID_2_0 = "http://java.sun.com/xml/ns/j2ee
web-jsptaglibrary_2_0.xsd";
+
private static String TLD_SYSTEMID_1_2 =
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";;
private static String TLD_SYSTEMID_1_1 =
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";;
+ private static String TLD_XSD_FILE_NAME_2_0 =
"resources/web-jsptaglibrary_2_0.xsd";
+
private static String TLD_DTD_FILE_NAME_1_2 =
"resources/web-jsptaglibrary_1_2.dtd";
***************
*** 68,75 ****
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
setDestinationFile(filename);
-
- setPublicId(TLD_PUBLICID_1_2);
- setSystemId(TLD_SYSTEMID_1_2);
- setDtdURL(getClass().getResource(TLD_DTD_FILE_NAME_1_2));
}
--- 75,78 ----
***************
*** 277,281 ****
public void execute() throws XDocletException
{
! if (getJspversion().equals(JspVersionTypes.VERSION_1_1)) {
setPublicId(TLD_PUBLICID_1_1);
setSystemId(TLD_SYSTEMID_1_1);
--- 280,291 ----
public void execute() throws XDocletException
{
! if (getJspversion().equals(JspVersionTypes.VERSION_2_0)) {
! setPublicId(TLD_PUBLICID_2_0);
! // xmlns attribute
! setSystemId(TLD_SYSTEMID_2_0);
! // xsi:schemaLocation
! setSchema(TLD_XSD_FILE_NAME_2_0);
! }
! else if (getJspversion().equals(JspVersionTypes.VERSION_1_1)) {
setPublicId(TLD_PUBLICID_1_1);
setSystemId(TLD_SYSTEMID_1_1);
Index: WebXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/WebXmlSubTask.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** WebXmlSubTask.java 8 Oct 2004 22:46:03 -0000 1.13
--- WebXmlSubTask.java 16 Jan 2005 11:41:55 -0000 1.14
***************
*** 66,69 ****
--- 66,71 ----
* containing ejb-local-ref entities for any EJB local references for a
class not specified in web.ejb-local-ref
* tags."
+ * @xdoclet.merge-file file="taglib-functions.ent"
relates-to="taglib_tld.xml" description="An XML unparsed entity
+ * containing describe functions in JSP 2.0 taglibs."
*/
public class WebXmlSubTask extends XmlSubTask
***************
*** 73,84 ****
--- 75,94 ----
private static String GENERATED_FILE_NAME = "web.xml";
+ private static String WEBXML_PUBLICID_2_4 =
"http://java.sun.com/xml/ns/j2ee";;
+ // xmlns attribute
+
private static String WEBXML_PUBLICID_2_3 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.3//EN";
private static String WEBXML_PUBLICID_2_2 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.2//EN";
+ private static String WEBXML_SYSTEMID_2_4 =
"http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";;
+ // xsi:schemaLocation
+
private static String WEBXML_SYSTEMID_2_3 =
"http://java.sun.com/dtd/web-app_2_3.dtd";;
private static String WEBXML_SYSTEMID_2_2 =
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";;
+ private static String WEBXML_XSD_FILE_NAME_2_4 =
"resources/web-app_2_4.xsd";
+
private static String WEBXML_DTD_FILE_NAME_2_3 =
"resources/web-jar-23.dtd";
***************
*** 363,367 ****
public void execute() throws XDocletException
{
! if (getServletspec().equals("2.2")) {
setPublicId(WEBXML_PUBLICID_2_2);
setSystemId(WEBXML_SYSTEMID_2_2);
--- 373,384 ----
public void execute() throws XDocletException
{
! if (getServletspec().equals("2.4")) {
! setPublicId(WEBXML_PUBLICID_2_4);
! // xmlns attribute
! setSystemId(WEBXML_SYSTEMID_2_4);
! // xsi:schemaLocation
! setSchema(WEBXML_XSD_FILE_NAME_2_4);
! }
! else if (getServletspec().equals("2.2")) {
setPublicId(WEBXML_PUBLICID_2_2);
setSystemId(WEBXML_SYSTEMID_2_2);
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
