Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web
In directory
sc8-pr-cvs1:/tmp/cvs-serv15636/xdoclet-all/xdoclet/modules/web/src/xdoclet/modules/web
Modified Files:
WebXmlSubTask.java JspTaglibSubTask.java
Log Message:
XDT-342: Merge points not documented
Index: WebXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/WebXmlSubTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** WebXmlSubTask.java 18 Oct 2002 16:17:00 -0000 1.8
--- WebXmlSubTask.java 23 Mar 2003 00:32:32 -0000 1.9
***************
*** 15,22 ****
* Generates web.xml deployment descriptor.
*
! * @author Ara Abrahamian ([EMAIL PROTECTED])
! * @created June 19, 2001
! * @ant.element display-name="web.xml" name="deploymentdescriptor"
parent="xdoclet.modules.web.WebDocletTask"
! * @version $Revision$
*/
public class WebXmlSubTask extends XmlSubTask
--- 15,69 ----
* Generates web.xml deployment descriptor.
*
! * @author Ara Abrahamian ([EMAIL PROTECTED])
! * @created June 19, 2001
! * @ant.element display-name="web.xml" name="deploymentdescriptor"
parent="xdoclet.modules.web.WebDocletTask"
! * @version $Revision$
! * @xdoclet.merge-file file="web-settings.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * (icon?, display-name?, description?, distributable?, context-param*)
elements, to be used instead of generating
! * them from config parameters."
! * @xdoclet.merge-file file="filters.xml" relates-to="web.xml" description="An XML
unparsed entity containing the
! * filter elements for any additional filters not processed by XDoclet."
! * @xdoclet.merge-file file="filter-mappings.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * the filter-mapping elements for any additional filters not processed by
XDoclet."
! * @xdoclet.merge-file file="listeners.xml" relates-to="web.xml" description="An
XML unparsed entity containing the
! * listener elements for any additional listeners not processed by XDoclet."
! * @xdoclet.merge-file file="servlets.xml" relates-to="web.xml" description="An
XML unparsed entity containing the
! * servlet elements for any additional servlets not processed by XDoclet."
! * @xdoclet.merge-file file="servlet-mappings.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * the servlet-mapping elements for any additional servlets not processed by
XDoclet."
! * @xdoclet.merge-file file="web-sec-rolerefs-{0}.xml" relates-to="web.xml"
description="An XML unparsed entity
! * containing any security-role-ref elements for a servlet, to use instead of
generating from web.security-role-ref
! * tags."
! * @xdoclet.merge-file file="mime-mappings.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * the mime-mapping elements for the web application."
! * @xdoclet.merge-file file="welcomefiles.xml" relates-to="web.xml"
description="XML document containing a
! * welcome-file-list element, used instead of welcomeFiles config parameters."
! * @xdoclet.merge-file file="error-pages.xml" relates-to="web.xml" description="An
XML unparsed entity containing the
! * error-page elements for the web application."
! * @xdoclet.merge-file file="taglibs.xml" relates-to="web.xml" description="An XML
unparsed entity containing taglib
! * elements, for tag libraries not defined in tagLibs config parameters."
! * @xdoclet.merge-file file="web-resource-env-refs.xml" relates-to="web.xml"
description="An XML unparsed entity
! * containing resource-env-ref elements for any resources not specified by
web.resource-env-ref tags."
! * @xdoclet.merge-file file="ejb-resourcerefs.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * resource-ref entities for any resources not specified in web.resource-ref
tags."
! * @xdoclet.merge-file file="ejb-resourcerefs-{0}.xml" relates-to="web.xml"
description="An XML unparsed entity
! * containing resource-ref entities for any resources for a class not specified
in web.resource-ref tags."
! * @xdoclet.merge-file file="web-security.xml" relates-to="web.xml"
description="An XML unparsed entity containing the
! * (security-constraint*, login-config?) elements for the web application."
! * @xdoclet.merge-file file="web-sec-roles.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * security-role entities for any roles not specified in web.security-role
tags."
! * @xdoclet.merge-file file="web-env-entries.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * env-entry entities for any entries not specified in web.env-entry tags."
! * @xdoclet.merge-file file="web-env-entries-{0}.xml" relates-to="web.xml"
description="An XML unparsed entity
! * containing env-entry entities for any entries for a class not specified in
web.env-entry tags."
! * @xdoclet.merge-file file="web-ejbrefs.xml" relates-to="web.xml" description="An
XML unparsed entity containing
! * ejb-ref entities for any EJB references not specified in web.ejb-ref tags."
! * @xdoclet.merge-file file="web-ejbrefs-{0}.xml" relates-to="web.xml"
description="An XML unparsed entity containing
! * ejb-ref entities for any EJB references for a class not specified in
web.ejb-ref tags."
! * @xdoclet.merge-file file="web-ejbrefs-local.xml" relates-to="web.xml"
description="An XML unparsed entity
! * containing ejb-local-ref entities for any EJB local references not specified
in web.ejb-local-ref tags."
! * @xdoclet.merge-file file="web-ejbrefs-local-{0}.xml" relates-to="web.xml"
description="An XML unparsed entity
! * containing ejb-local-ref entities for any EJB local references for a class
not specified in web.ejb-local-ref
! * tags."
*/
public class WebXmlSubTask extends XmlSubTask
Index: JspTaglibSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/JspTaglibSubTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** JspTaglibSubTask.java 14 Sep 2002 02:30:42 -0000 1.12
--- JspTaglibSubTask.java 23 Mar 2003 00:32:32 -0000 1.13
***************
*** 14,21 ****
* Generates taglib.tld deployment descriptor for JSP taglibs.
*
! * @author Ara Abrahamian ([EMAIL PROTECTED])
! * @created July 12, 2001
! * @ant.element display-name="JSP Taglib" name="jsptaglib"
parent="xdoclet.modules.web.WebDocletTask"
! * @version $Revision$
*/
public class JspTaglibSubTask extends XmlSubTask
--- 14,29 ----
* Generates taglib.tld deployment descriptor for JSP taglibs.
*
! * @author Ara Abrahamian ([EMAIL PROTECTED])
! * @created July 12, 2001
! * @ant.element display-name="JSP Taglib" name="jsptaglib"
parent="xdoclet.modules.web.WebDocletTask"
! * @version $Revision$
! * @xdoclet.merge-file file="taglib-settings.xml" relates-to="taglib.tld"
description="Unparsed XML entity containing
! * (tlib-version, jsp-version, short-name, uri?, display-name?, small-icon?,
large-icon?, description?) elements."
! * @xdoclet.merge-file file="taglib-validator.xml" relates-to="taglib.tld"
description="XML document containing the
! * validator element, used to include a validator which isn't processed by
XDoclet."
! * @xdoclet.merge-file file="taglib-listener.xml" relates-to="taglib.tld"
description="Unparsed XML entity containing
! * additional listener elements, for including listeners not processed by
XDoclet."
! * @xdoclet.merge-file file="taglib-tag.xml" relates-to="taglib.tld"
description="Unparsed XML entity containing
! * additional tag elements, for including tags not processed by XDoclet."
*/
public class JspTaglibSubTask extends XmlSubTask
***************
*** 422,425 ****
--- 430,434 ----
public final static String VERSION_1_2 = "1.2";
public final static String VERSION_2_0 = "2.0";
+
// We're getting there!
-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open!
Get cracking and register here for some mind boggling fun and
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
