Update of /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5523/src/xdoclet/tagshandler
Modified Files: MergeTagsHandler.java Log Message: improved debugging for nested merge files; show file that caused error Index: MergeTagsHandler.java =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/MergeTagsHandler.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** MergeTagsHandler.java 19 Jul 2005 19:12:16 -0000 1.15 --- MergeTagsHandler.java 25 Jul 2005 16:55:35 -0000 1.16 *************** *** 17,20 **** --- 17,21 ---- import org.apache.commons.logging.Log; + import xdoclet.MergeException; import xdoclet.TemplateSubTask; import xdoclet.XDocletException; *************** *** 364,367 **** --- 365,374 ---- throw new XDocletException(e.getMessage()); } + catch (MergeException e) { + throw e; + } + catch (Exception e) { + throw new MergeException(e, "error in merged file " + mergeFile); + } } ------------------------------------------------------- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click _______________________________________________ xdoclet-devel mailing list xdoclet-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xdoclet-devel