CVS: xdoclet/modules/web/src/xdoclet/modules/web/resources taglib_tld.xdt,1.15,1.16

Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19984/resources

Modified Files:
	taglib_tld.xdt 
Log Message:
Moved the functions merge point, fixes XDT-1494.  Also moved its documentation to the correct subtask.

Index: taglib_tld.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources/taglib_tld.xdt,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** taglib_tld.xdt	6 Aug 2005 18:40:43 -0000	1.15
--- taglib_tld.xdt	6 Aug 2005 23:37:54 -0000	1.16
***************
*** 70,78 ****
    </XDtClass:forAllClasses>
    </XDtMerge:merge>
-   
-   <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="2.0">
-    <XDtMerge:merge file="taglib-functions.ent">
-    </XDtMerge:merge>
-   </XDtConfig:ifConfigParamGreaterOrEquals>  
  
    <XDtClass:forAllClasses type="javax.servlet.http.HttpSessionActivationListener,javax.servlet.http.HttpSessionAttributeListener,javax.servlet.http.HttpSessionBindingListener,javax.servlet.http.HttpSessionListener,javax.servlet.ServletContextAttributeListener,javax.servlet.ServletContextListener" abstract="false">
--- 70,73 ----
***************
*** 253,256 ****
--- 248,256 ----
    <XDtMerge:merge file="taglib-tag.xml">
    </XDtMerge:merge>
+   
+   <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="2.0">
+    <XDtMerge:merge file="taglib-functions.ent">
+    </XDtMerge:merge>
+   </XDtConfig:ifConfigParamGreaterOrEquals>  
  
  </taglib>



-------------------------------------------------------
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