Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19984
Modified Files:
JspTaglibSubTask.java WebXmlSubTask.java
Log Message:
Moved the functions merge point, fixes XDT-1494. Also moved its documentation
to the correct subtask.
Index: JspTaglibSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/JspTaglibSubTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** JspTaglibSubTask.java 16 Jan 2005 11:41:55 -0000 1.15
--- JspTaglibSubTask.java 6 Aug 2005 23:37:53 -0000 1.16
***************
*** 26,29 ****
--- 26,31 ----
* @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."
+ * @xdoclet.merge-file file="taglib-functions.ent"
relates-to="taglib_tld.xml" description="An XML unparsed entity
+ * containing function elements, describing the EL functions in JSP 2.0
taglibs."
*/
public class JspTaglibSubTask extends XmlSubTask
Index: WebXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/WebXmlSubTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** WebXmlSubTask.java 2 Mar 2005 19:26:39 -0000 1.15
--- WebXmlSubTask.java 6 Aug 2005 23:37:53 -0000 1.16
***************
*** 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
--- 66,69 ----
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
