husted 2004/03/07 12:29:31
Modified: web/example Registration.jsp changePassword.jsp index.jsp
logon.jsp mainMenu.jsp staticJavascript.jsp
subscription.jsp welcome.jsp
web/example/WEB-INF web.xml
Log:
Conform tag imports to examples and blank applications.
Revision Changes Path
1.3 +4 -4 jakarta-struts/web/example/Registration.jsp
Index: Registration.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/Registration.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Registration.jsp 21 Dec 2003 22:46:09 -0000 1.2
+++ Registration.jsp 7 Mar 2004 20:29:31 -0000 1.3
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/tags/app" prefix="app" %>
+<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
+<%@ taglib uri="/tags/struts-html" prefix="html" %>
+<%@ taglib uri="/tags/struts-logic" prefix="logic" %>
<logic:equal name="RegistrationForm" property="action"
scope="request" value="Edit">
<app:checkLogon/>
1.3 +2 -2 jakarta-struts/web/example/changePassword.jsp
Index: changePassword.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/changePassword.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changePassword.jsp 21 Dec 2003 22:46:09 -0000 1.2
+++ changePassword.jsp 7 Mar 2004 20:29:31 -0000 1.3
@@ -1,6 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
+<%@ taglib uri="/tags/struts-html" prefix="html" %>
<html:html locale="true">
<head>
1.20 +1 -1 jakarta-struts/web/example/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/index.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- index.jsp 7 Mar 2004 20:22:52 -0000 1.19
+++ index.jsp 7 Mar 2004 20:29:31 -0000 1.20
@@ -1,4 +1,4 @@
-<%@ taglib uri="WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/tags/struts-logic" prefix="logic" %>
<logic:redirect action="welcome"/>
<%--
1.24 +2 -2 jakarta-struts/web/example/logon.jsp
Index: logon.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/logon.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- logon.jsp 21 Dec 2003 22:46:09 -0000 1.23
+++ logon.jsp 7 Mar 2004 20:29:31 -0000 1.24
@@ -1,6 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
+<%@ taglib uri="/tags/struts-html" prefix="html" %>
<html:html locale="true">
<head>
1.16 +3 -3 jakarta-struts/web/example/mainMenu.jsp
Index: mainMenu.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/mainMenu.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mainMenu.jsp 21 Dec 2003 22:46:09 -0000 1.15
+++ mainMenu.jsp 7 Mar 2004 20:29:31 -0000 1.16
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/tags/app" prefix="app" %>
+<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
+<%@ taglib uri="/tags/struts-html" prefix="html" %>
<app:checkLogon/>
<jsp:useBean id="user" scope="session"
type="org.apache.struts.webapp.example.User"/>
1.2 +1 -1 jakarta-struts/web/example/staticJavascript.jsp
Index: staticJavascript.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/staticJavascript.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- staticJavascript.jsp 14 Jul 2002 01:35:18 -0000 1.1
+++ staticJavascript.jsp 7 Mar 2004 20:29:31 -0000 1.2
@@ -2,6 +2,6 @@
<%-- set document type to Javascript (addresses a bug in Netscape according to a
web resource --%>
<%@ page contentType="application/x-javascript" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="/tags/struts-html" prefix="html" %>
<html:javascript dynamicJavascript="false" staticJavascript="true"/>
1.31 +4 -4 jakarta-struts/web/example/subscription.jsp
Index: subscription.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/subscription.jsp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- subscription.jsp 17 Feb 2003 00:31:45 -0000 1.30
+++ subscription.jsp 7 Mar 2004 20:29:31 -0000 1.31
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/tags/app" prefix="app" %>
+<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
+<%@ taglib uri="/tags/struts-html" prefix="html" %>
+<%@ taglib uri="/tags/struts-logic" prefix="logic" %>
<app:checkLogon/>
<html:html>
1.2 +3 -3 jakarta-struts/web/example/welcome.jsp
Index: welcome.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/welcome.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- welcome.jsp 21 Dec 2003 22:45:41 -0000 1.1
+++ welcome.jsp 7 Mar 2004 20:29:31 -0000 1.2
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
+<%@ taglib uri="/tags/struts-html" prefix="html" %>
+<%@ taglib uri="/tags/struts-logic" prefix="logic" %>
<html:html locale="true">
<head>
1.19 +8 -6 jakarta-struts/web/example/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/web.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- web.xml 25 Apr 2003 03:07:45 -0000 1.18
+++ web.xml 7 Mar 2004 20:29:31 -0000 1.19
@@ -33,24 +33,26 @@
<!-- Application Tag Library Descriptor -->
<taglib>
- <taglib-uri>/WEB-INF/app.tld</taglib-uri>
+ <taglib-uri>/tags/app</taglib-uri>
<taglib-location>/WEB-INF/app.tld</taglib-location>
</taglib>
<!-- Struts Tag Library Descriptors -->
<taglib>
- <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
+ <taglib-uri>/tags/struts-bean</taglib-uri>
<taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
</taglib>
-
<taglib>
- <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
+ <taglib-uri>/tags/struts-html</taglib-uri>
<taglib-location>/WEB-INF/struts-html.tld</taglib-location>
</taglib>
-
<taglib>
- <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
+ <taglib-uri>/tags/struts-logic</taglib-uri>
<taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>/tags/struts-nested</taglib-uri>
+ <taglib-location>/WEB-INF/struts-nested.tld</taglib-location>
</taglib>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
