Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22748/plugin-web/src/main/java/org/xdoclet/plugin/web
Modified Files:
TaglibPlugin.java WebPlugin.java WebPlugin.jelly WebUtils.java
Removed Files:
web-app_2_2.dtd web-app_2_3.dtd web-jsptaglibrary_1_2.dtd
Log Message:
XDP-93 added missing dependent xsd/dtd's + moved them to subdir - !! tests are
still failing :(
Index: WebUtils.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WebUtils.java 1 Dec 2005 00:45:21 -0000 1.7
--- WebUtils.java 2 Dec 2005 20:32:35 -0000 1.8
***************
*** 19,25 ****
*/
public class WebUtils {
! protected static final String SERVLET_22 = "2.2";
! protected static final String SERVLET_23 = "2.3";
! protected static final String SERVLET_24 = "2.4";
private String servletVersion;
--- 19,25 ----
*/
public class WebUtils {
! static final String SERVLET_22 = "2.2";
! static final String SERVLET_23 = "2.3";
! static final String SERVLET_24 = "2.4";
private String servletVersion;
Index: WebPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** WebPlugin.java 1 Dec 2005 00:45:21 -0000 1.21
--- WebPlugin.java 2 Dec 2005 20:32:35 -0000 1.22
***************
*** 36,43 ****
*/
public class WebPlugin extends QDoxPlugin {
! public static final String PUBLIC_ID_2_2 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.2//EN";
! public static final String SYSTEM_ID_2_2 =
"http://java.sun.com/dtd/web-app_2_2.dtd";;
! public static final String PUBLIC_ID_2_3 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.3//EN";
! public static final String SYSTEM_ID_2_3 =
"http://java.sun.com/dtd/web-app_2_3.dtd";;
private String publicId = PUBLIC_ID_2_3;
--- 36,44 ----
*/
public class WebPlugin extends QDoxPlugin {
! private static final String PUBLIC_ID_2_2 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.2//EN";
! private static final String SYSTEM_ID_2_2 =
"http://java.sun.com/dtd/web-app_2_2.dtd";;
! private static final String PUBLIC_ID_2_3 = "-//Sun Microsystems,
Inc.//DTD Web Application 2.3//EN";
! private static final String SYSTEM_ID_2_3 =
"http://java.sun.com/dtd/web-app_2_3.dtd";;
! private static final String SCHEMA_2_4 =
"http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";;
private String publicId = PUBLIC_ID_2_3;
***************
*** 68,73 ****
setFilereplace("web.xml");
Map dtds = new HashMap();
! dtds.put(WebPlugin.SYSTEM_ID_2_2,
getClass().getResource("web-app_2_2.dtd"));
! dtds.put(WebPlugin.SYSTEM_ID_2_3,
getClass().getResource("web-app_2_3.dtd"));
setOutputValidator(new XMLOutputValidator(dtds));
--- 69,83 ----
setFilereplace("web.xml");
Map dtds = new HashMap();
! dtds.put(SYSTEM_ID_2_2,
getClass().getResource("dtd/web-app_2_2.dtd"));
! dtds.put(SYSTEM_ID_2_3,
getClass().getResource("dtd/web-app_2_3.dtd"));
! dtds.put(SCHEMA_2_4, getClass().getResource("dtd/web-app_2_4.xsd"));
!
! dtds.put("http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd";,
getClass().getResource("dtd/jsp_2_0.xsd"));
! dtds.put("http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd";,
getClass().getResource("dtd/j2ee_1_4.xsd"));
!
dtds.put("http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd";,
getClass().getResource("dtd/j2ee_web_services_client_1_1.xsd"));
! dtds.put("http://www.w3.org/2001/xml.xsd";,
getClass().getResource("dtd/xml.xsd"));
! dtds.put("http://www.w3.org/2001/XMLSchema.dtd";,
getClass().getResource("dtd/XMLSchema.dtd"));
! dtds.put("http://www.w3.org/2001/datatypes.dtd";,
getClass().getResource("dtd/datatypes.dtd"));
!
setOutputValidator(new XMLOutputValidator(dtds));
***************
*** 93,96 ****
--- 103,127 ----
}
+ // TODO : this is to be replaced by an XmlDocVersion class
+ public boolean needsDoctype() {
+ return !getWebUtils().isMinimumServletVersion(WebUtils.SERVLET_24);
+ }
+
+ public boolean needsSchema() {
+ return getWebUtils().isMinimumServletVersion(WebUtils.SERVLET_24);
+ }
+
+ public String getSchemaXmlNs() {
+ return needsSchema() ? "http://java.sun.com/xml/ns/j2ee"; : null;
+ }
+
+ public String getSchemaXmlNsXsi() {
+ return needsSchema() ? "http://www.w3.org/2001/XMLSchema-instance"; :
null;
+ }
+
+ public String getSchemaXsiSchemaLocation() {
+ return needsSchema() ? "http://java.sun.com/xml/ns/j2ee " +
SCHEMA_2_4 : null;
+ }
+
/**
* Returns an ordered collection of all the filters passed to the plugin.
--- web-jsptaglibrary_1_2.dtd DELETED ---
--- web-app_2_3.dtd DELETED ---
Index: WebPlugin.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** WebPlugin.jelly 1 Dec 2005 00:45:21 -0000 1.15
--- WebPlugin.jelly 2 Dec 2005 20:32:35 -0000 1.16
***************
*** 20,31 ****
temp fix: use only small-icon -->
<jxml:doctype name="web-app"
publicId="${plugin.publicId}"
systemId="${plugin.systemId}"/>
<!-- TODO : mergepoints -->
<!-- TODO : check exactly what parameters are mandatory or not, esp. with
ejb-reb and such -->
! <web-app>
<!--TODO : distributable : add this tag conditionaly/-->
--- 20,40 ----
temp fix: use only small-icon -->
+ <j:if test="${plugin.needsDoctype()}">
<jxml:doctype name="web-app"
publicId="${plugin.publicId}"
systemId="${plugin.systemId}"/>
+ </j:if>
<!-- TODO : mergepoints -->
<!-- TODO : check exactly what parameters are mandatory or not, esp. with
ejb-reb and such -->
! <jxml:element URI="${plugin.schemaXmlNs}" name="web-app">
! <j:if test="${plugin.needsSchema()}">
! <jxml:attribute URI="${plugin.schemaXmlNsXsi}"
name="xsi:schemaLocation"
trim="true">${plugin.schemaXsiSchemaLocation}</jxml:attribute>
! <jxml:attribute name="version"
trim="true">${plugin.servletversion}</jxml:attribute>
! </j:if>
!
! <jxml:replaceNamespace toURI="${plugin.schemaXmlNs}">
!
<!--TODO : distributable : add this tag conditionaly/-->
***************
*** 191,196 ****
</j:forEach>
</j:if>
!
! </web-app>
!
</j:jelly>
--- 200,204 ----
</j:forEach>
</j:if>
! </jxml:replaceNamespace>
! </jxml:element>
</j:jelly>
Index: TaglibPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/TaglibPlugin.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TaglibPlugin.java 30 Aug 2005 02:03:06 -0000 1.17
--- TaglibPlugin.java 2 Dec 2005 20:32:35 -0000 1.18
***************
*** 25,28 ****
--- 25,29 ----
* TODO : eventually make a plugin to generate simple tei classes, if it has
any difference to declaring variables in the tag
*
+ * TODO : have DTD/XSD for other versions than 1.2 !
*
* <p><br/><br/>created Oct 20, 2003 10:04:09 PM</p>
***************
*** 95,99 ****
Map dtds = new HashMap();
! dtds.put(TaglibPlugin.SYSTEM_ID_1_2,
getClass().getResource("web-jsptaglibrary_1_2.dtd"));
setOutputValidator(new XMLOutputValidator(dtds));
--- 96,107 ----
Map dtds = new HashMap();
! dtds.put(TaglibPlugin.SYSTEM_ID_1_2,
getClass().getResource("dtd/web-jsptaglibrary_1_2.dtd"));
! dtds.put(TaglibPlugin.SYSTEM_ID_1_2,
getClass().getResource("dtd/jsp_2_0.xsd"));
! dtds.put("http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd";,
getClass().getResource("dtd/jsp_2_0.xsd"));
! dtds.put("http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd";,
getClass().getResource("dtd/j2ee_1_4.xsd"));
! dtds.put("http://www.w3.org/2001/xml.xsd";,
getClass().getResource("dtd/xml.xsd"));
! dtds.put("http://www.w3.org/2001/XMLSchema.dtd";,
getClass().getResource("dtd/XMLSchema.dtd"));
! dtds.put("http://www.w3.org/2001/datatypes.dtd";,
getClass().getResource("dtd/datatypes.dtd"));
!
setOutputValidator(new XMLOutputValidator(dtds));
--- web-app_2_2.dtd DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
