Update of /cvsroot/xdoclet/xdoclet/modules/jboss/src/xdoclet/modules/jboss/web
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1257/xdoclet/modules/jboss/src/xdoclet/modules/jboss/web
Modified Files:
JBossWebXmlSubTask.java
Log Message:
Add support for servlet spec 2.4, which results in jboss-web_4_0.dtd.
XDT-1177.
Index: JBossWebXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jboss/src/xdoclet/modules/jboss/web/JBossWebXmlSubTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** JBossWebXmlSubTask.java 10 Oct 2004 22:12:03 -0000 1.12
--- JBossWebXmlSubTask.java 16 Jan 2005 12:51:48 -0000 1.13
***************
*** 29,40 ****
--- 29,43 ----
public class JBossWebXmlSubTask extends XmlSubTask
{
+ private final static String JBOSS_WEB_PUBLICID_4_0 = "-//JBoss//DTD Web
Application 2.4//EN";
private final static String JBOSS_WEB_PUBLICID_3_2 = "-//JBoss//DTD Web
Application 2.3V2//EN";
private final static String JBOSS_WEB_PUBLICID_3_0 = "-//JBoss//DTD Web
Application 2.3//EN";
private final static String JBOSS_WEB_PUBLICID_2_4 = "-//JBoss//DTD Web
Application 2.2//EN";
+ private final static String JBOSS_WEB_SYSTEMID_4_0 =
"http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd";;
private final static String JBOSS_WEB_SYSTEMID_3_2 =
"http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd";;
private final static String JBOSS_WEB_SYSTEMID_3_0 =
"http://www.jboss.org/j2ee/dtd/jboss-web_3_0.dtd";;
private final static String JBOSS_WEB_SYSTEMID_2_4 =
"http://www.jboss.org/j2ee/dtd/jboss-web.dtd";;
+ private final static String JBOSS_WEB_DTD_FILE_NAME_4_0 =
"resources/jboss-web_4_0.dtd";
private final static String JBOSS_WEB_DTD_FILE_NAME_3_2 =
"resources/jboss-web_3_2.dtd";
private final static String JBOSS_WEB_DTD_FILE_NAME_3_0 =
"resources/jboss-web_3_0.dtd";
***************
*** 172,180 ****
setDtdURL(getClass().getResource(JBOSS_WEB_DTD_FILE_NAME_3_0));
}
! else {
setPublicId(JBOSS_WEB_PUBLICID_3_2);
setSystemId(JBOSS_WEB_SYSTEMID_3_2);
setDtdURL(getClass().getResource(JBOSS_WEB_DTD_FILE_NAME_3_2));
}
super.execute();
--- 175,188 ----
setDtdURL(getClass().getResource(JBOSS_WEB_DTD_FILE_NAME_3_0));
}
! else if
(getVersion().startsWith(JBossSubTask.JBossVersionTypes.VERSION_3_2)) {
setPublicId(JBOSS_WEB_PUBLICID_3_2);
setSystemId(JBOSS_WEB_SYSTEMID_3_2);
setDtdURL(getClass().getResource(JBOSS_WEB_DTD_FILE_NAME_3_2));
}
+ else {
+ setPublicId(JBOSS_WEB_PUBLICID_4_0);
+ setSystemId(JBOSS_WEB_SYSTEMID_4_0);
+ setDtdURL(getClass().getResource(JBOSS_WEB_DTD_FILE_NAME_4_0));
+ }
super.execute();
-------------------------------------------------------
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
