craigmcc 01/04/28 18:39:13 Modified: web/template-example chapter.jsp chapterTemplate.jsp introduction.jsp more.jsp next.jsp optional.jsp underConstruction.jsp using.jsp web/template-example/WEB-INF web.xml Log: Correct references to the struts-template.tld file to reflect how the standardized build procedure constructs web applications. PR: Bugzilla #1382 Submitted by: Michael Gerdau <[EMAIL PROTECTED]> Revision Changes Path 1.2 +1 -1 jakarta-struts/web/template-example/chapter.jsp Index: chapter.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/chapter.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- chapter.jsp 2000/10/16 19:16:16 1.1 +++ chapter.jsp 2001/04/29 01:39:11 1.2 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <template:insert template='/chapterTemplate.jsp'> 1.3 +1 -1 jakarta-struts/web/template-example/chapterTemplate.jsp Index: chapterTemplate.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/chapterTemplate.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- chapterTemplate.jsp 2001/01/12 01:50:49 1.2 +++ chapterTemplate.jsp 2001/04/29 01:39:11 1.3 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' prefix='template' %> +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <html><head><title><template:get name='title'/></title></head> <body background='graphics/blueAndWhiteBackground.gif'> 1.3 +1 -1 jakarta-struts/web/template-example/introduction.jsp Index: introduction.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/introduction.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- introduction.jsp 2001/01/11 11:28:31 1.2 +++ introduction.jsp 2001/04/29 01:39:11 1.3 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' prefix='template' %> +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <template:insert template='/chapterTemplate.jsp'> <template:put name='title' content='Templates' direct='true'/> 1.2 +1 -1 jakarta-struts/web/template-example/more.jsp Index: more.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/more.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- more.jsp 2001/01/12 01:50:49 1.1 +++ more.jsp 2001/04/29 01:39:11 1.2 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <template:insert template='/chapterTemplate.jsp'> 1.3 +1 -1 jakarta-struts/web/template-example/next.jsp Index: next.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/next.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- next.jsp 2001/01/11 11:28:32 1.2 +++ next.jsp 2001/04/29 01:39:11 1.3 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <% String msg = "In your application, you could insert some clever functionality into the file next.jsp, and then link to it from footer.html."; %> 1.2 +1 -1 jakarta-struts/web/template-example/optional.jsp Index: optional.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/optional.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- optional.jsp 2000/10/16 19:16:16 1.1 +++ optional.jsp 2001/04/29 01:39:11 1.2 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <template:insert template='/chapterTemplate.jsp'> 1.2 +1 -1 jakarta-struts/web/template-example/underConstruction.jsp Index: underConstruction.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/underConstruction.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- underConstruction.jsp 2000/10/16 19:16:16 1.1 +++ underConstruction.jsp 2001/04/29 01:39:11 1.2 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <template:insert template='/chapterTemplate.jsp'> 1.2 +1 -1 jakarta-struts/web/template-example/using.jsp Index: using.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/using.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- using.jsp 2000/10/16 19:16:16 1.1 +++ using.jsp 2001/04/29 01:39:11 1.2 @@ -1,4 +1,4 @@ -<%@ taglib uri='/WEB-INF/tlds/struts-template.tld' +<%@ taglib uri='/WEB-INF/struts-template.tld' prefix='template' %> <template:insert template='/chapterTemplate.jsp'> 1.5 +2 -2 jakarta-struts/web/template-example/WEB-INF/web.xml Index: web.xml =================================================================== RCS file: /home/cvs/jakarta-struts/web/template-example/WEB-INF/web.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- web.xml 2001/01/16 02:30:09 1.4 +++ web.xml 2001/04/29 01:39:12 1.5 @@ -13,8 +13,8 @@ <!-- Template Tag Library Descriptor --> <taglib> - <taglib-uri>/WEB-INF/tlds/struts-template.tld</taglib-uri> - <taglib-location>/WEB-INF/tlds/struts-template.tld</taglib-location> + <taglib-uri>/WEB-INF/struts-template.tld</taglib-uri> + <taglib-location>/WEB-INF/struts-template.tld</taglib-location> </taglib>