Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8999/modules/web/src/xdoclet/modules/web
Modified Files:
WebXmlSubTask.java
Log Message:
Added validation against the J2EE 1.4 schemas (XDT-1043) and fixed the
schemaLocation (XDT-1283)
Index: WebXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/WebXmlSubTask.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** WebXmlSubTask.java 16 Jan 2005 11:41:55 -0000 1.14
--- WebXmlSubTask.java 2 Mar 2005 19:26:39 -0000 1.15
***************
*** 71,99 ****
public class WebXmlSubTask extends XmlSubTask
{
! private static String DEFAULT_TEMPLATE_FILE = "resources/web_xml.xdt";
! 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";
! private static String WEBXML_DTD_FILE_NAME_2_2 =
"resources/web-jar-22.dtd";
! private static String XSD_LOCATION_24 =
"http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";;
protected String servletSpec = ServletVersionTypes.VERSION_2_3;
--- 71,99 ----
public class WebXmlSubTask extends XmlSubTask
{
! private final static String DEFAULT_TEMPLATE_FILE =
"resources/web_xml.xdt";
! private final static String GENERATED_FILE_NAME = "web.xml";
! private final static String WEBXML_PUBLICID_2_4 =
"http://java.sun.com/xml/ns/j2ee";;
// xmlns attribute
! private final static String WEBXML_PUBLICID_2_3 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.3//EN";
! private final static String WEBXML_PUBLICID_2_2 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.2//EN";
! private final 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 final static String WEBXML_SYSTEMID_2_3 =
"http://java.sun.com/dtd/web-app_2_3.dtd";;
! private final static String WEBXML_SYSTEMID_2_2 =
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";;
! private final static String WEBXML_XSD_FILE_NAME_2_4 =
"resources/web-app_2_4.xsd";
! private final static String WEBXML_DTD_FILE_NAME_2_3 =
"resources/web-jar-23.dtd";
! private final static String WEBXML_DTD_FILE_NAME_2_2 =
"resources/web-jar-22.dtd";
! private final static String XSD_LOCATION_24 =
"http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";;
protected String servletSpec = ServletVersionTypes.VERSION_2_3;
***************
*** 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);
--- 373,377 ----
public void execute() throws XDocletException
{
! if (getServletspec().equals("2.2")) {
setPublicId(WEBXML_PUBLICID_2_2);
setSystemId(WEBXML_SYSTEMID_2_2);
***************
*** 387,390 ****
--- 380,384 ----
else if (getServletspec().equals("2.4")) {
setSchema(XSD_LOCATION_24);
+ setSchemaURL(getClass().getResource(WEBXML_XSD_FILE_NAME_2_4));
}
else {
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
