You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ws...@apache.org on 2005/08/07 14:55:44 UTC

svn commit: r230663 - in /struts/el/trunk/web/exercise-taglib: ./ WEB-INF/

Author: wsmoak
Date: Sun Aug  7 05:55:28 2005
New Revision: 230663

URL: http://svn.apache.org/viewcvs?rev=230663&view=rev
Log:
Updates for Servlet 2.3: removed <taglib> tags from web.xml and changed taglib URIs in the JSPs

Modified:
    struts/el/trunk/web/exercise-taglib/WEB-INF/web.xml
    struts/el/trunk/web/exercise-taglib/bean-cookie.jsp
    struts/el/trunk/web/exercise-taglib/bean-define.jsp
    struts/el/trunk/web/exercise-taglib/bean-dyna.jsp
    struts/el/trunk/web/exercise-taglib/bean-header.jsp
    struts/el/trunk/web/exercise-taglib/bean-include.jsp
    struts/el/trunk/web/exercise-taglib/bean-parameter.jsp
    struts/el/trunk/web/exercise-taglib/bean-resource.jsp
    struts/el/trunk/web/exercise-taglib/bean-size.jsp
    struts/el/trunk/web/exercise-taglib/bean-write.jsp
    struts/el/trunk/web/exercise-taglib/html-button.jsp
    struts/el/trunk/web/exercise-taglib/html-file.jsp
    struts/el/trunk/web/exercise-taglib/html-frame.jsp
    struts/el/trunk/web/exercise-taglib/html-frame1.jsp
    struts/el/trunk/web/exercise-taglib/html-indexed.jsp
    struts/el/trunk/web/exercise-taglib/html-input.jsp
    struts/el/trunk/web/exercise-taglib/html-link.jsp
    struts/el/trunk/web/exercise-taglib/html-messages.jsp
    struts/el/trunk/web/exercise-taglib/html-multibox.jsp
    struts/el/trunk/web/exercise-taglib/html-radio.jsp
    struts/el/trunk/web/exercise-taglib/html-select.jsp
    struts/el/trunk/web/exercise-taglib/html-setters.jsp
    struts/el/trunk/web/exercise-taglib/index.jsp
    struts/el/trunk/web/exercise-taglib/logic-compare.jsp
    struts/el/trunk/web/exercise-taglib/logic-empty.jsp
    struts/el/trunk/web/exercise-taglib/logic-iterate.jsp
    struts/el/trunk/web/exercise-taglib/logic-match.jsp
    struts/el/trunk/web/exercise-taglib/logic-present.jsp
    struts/el/trunk/web/exercise-taglib/logic-redirect.jsp
    struts/el/trunk/web/exercise-taglib/showSource.jsp

Modified: struts/el/trunk/web/exercise-taglib/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/WEB-INF/web.xml?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/WEB-INF/web.xml (original)
+++ struts/el/trunk/web/exercise-taglib/WEB-INF/web.xml Sun Aug  7 05:55:28 2005
@@ -46,30 +46,4 @@
   </welcome-file-list>
 
 
-  <!-- Struts Tag Library Descriptors -->
-  <taglib>
-    <taglib-uri>/WEB-INF/struts-bean-el.tld</taglib-uri>
-    <taglib-location>/WEB-INF/struts-bean-el.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>/WEB-INF/struts-html-el.tld</taglib-uri>
-    <taglib-location>/WEB-INF/struts-html-el.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>/WEB-INF/struts-logic-el.tld</taglib-uri>
-    <taglib-location>/WEB-INF/struts-logic-el.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>/WEB-INF/c.tld</taglib-uri>
-    <taglib-location>/WEB-INF/c.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
-    <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
-  </taglib>
-
 </web-app>

Modified: struts/el/trunk/web/exercise-taglib/bean-cookie.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-cookie.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-cookie.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-cookie.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld"  prefix="bean" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"  prefix="bean" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
 <html-el:html>
 <head>
 <title>Test Replacements for struts-bean:cookie Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/bean-define.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-define.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-define.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-define.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test Replacements for struts-bean:define Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/bean-dyna.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-dyna.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-dyna.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-dyna.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld"  prefix="bean" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"  prefix="bean" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
  <head>
   <title>

Modified: struts/el/trunk/web/exercise-taglib/bean-header.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-header.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-header.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-header.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld"  prefix="bean" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"  prefix="bean" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test Replacements for struts-bean:header Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/bean-include.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-include.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-include.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-include.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test bean-el:include Tag and Replacements</title>

Modified: struts/el/trunk/web/exercise-taglib/bean-parameter.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-parameter.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-parameter.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-parameter.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test Replacements for struts-bean:parameter Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/bean-resource.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-resource.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-resource.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-resource.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test struts bean-el Resource Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/bean-size.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-size.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-size.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-size.jsp Sun Aug  7 05:55:28 2005
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html>
 <head>
 <title>Test struts bean-el Size Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/bean-write.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/bean-write.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/bean-write.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/bean-write.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test Replacements for struts bean:write Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/html-button.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-button.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-button.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-button.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
  <head>
   <title>Test html-el:button Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/html-file.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-file.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-file.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-file.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
  <head>
   <title>Test html-el:file Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/html-frame.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-frame.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-frame.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-frame.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%
  Integer border = new Integer(0);
  pageContext.setAttribute("border", border);

Modified: struts/el/trunk/web/exercise-taglib/html-frame1.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-frame1.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-frame1.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-frame1.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
  <head>
  </head>

Modified: struts/el/trunk/web/exercise-taglib/html-indexed.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-indexed.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-indexed.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-indexed.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
  <head>
   <title>Test indexed HTML tags</title>

Modified: struts/el/trunk/web/exercise-taglib/html-input.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-input.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-input.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-input.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%
  String thing = "thing";
  pageContext.setAttribute("thing", thing);

Modified: struts/el/trunk/web/exercise-taglib/html-link.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-link.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-link.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-link.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html locale="${!empty pageScope}" xhtml="${!empty pageScope}">
 <head>
 <title>Test html-el:link Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/html-messages.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-messages.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-messages.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-messages.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" import="org.apache.struts.action.*,
                                  org.apache.struts.Globals" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html>
 <head>
 <title>Test Error and Message Tags</title>

Modified: struts/el/trunk/web/exercise-taglib/html-multibox.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-multibox.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-multibox.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-multibox.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test html-el:multibox Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/html-radio.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-radio.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-radio.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-radio.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
  <head>
   <title>Test html-el:radio Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/html-select.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-select.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-select.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-select.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" import="java.util.*, org.apache.struts.util.*"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test html-el:select Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/html-setters.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-setters.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-setters.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-setters.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test struts-html-el Property Setters</title>

Modified: struts/el/trunk/web/exercise-taglib/index.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/index.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/index.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/index.jsp Sun Aug  7 05:55:28 2005
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
 <html>
 <head>
 <title>Struts-EL Test Application</title>

Modified: struts/el/trunk/web/exercise-taglib/logic-compare.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-compare.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-compare.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-compare.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test Replacements for struts comparison tags</title>

Modified: struts/el/trunk/web/exercise-taglib/logic-empty.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-empty.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-empty.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-empty.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test Replacements for struts emptiness tags</title>

Modified: struts/el/trunk/web/exercise-taglib/logic-iterate.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-iterate.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-iterate.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-iterate.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el" %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test struts logic-el Iterate Tag</title>

Modified: struts/el/trunk/web/exercise-taglib/logic-match.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-match.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-match.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-match.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el"  %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test struts logic-el Match Tags</title>

Modified: struts/el/trunk/web/exercise-taglib/logic-present.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-present.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-present.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-present.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
 <head>
 <title>Test Struts presence tags and Replacements</title>

Modified: struts/el/trunk/web/exercise-taglib/logic-redirect.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/logic-redirect.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/logic-redirect.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/logic-redirect.jsp Sun Aug  7 05:55:28 2005
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el" %>
-<%@ taglib uri="/WEB-INF/struts-logic-el.tld"  prefix="logic-el"  %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic-el"  prefix="logic-el"  %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <c:if test='${not empty param["redirectType"]}'>
  <c:choose>
   <c:when test='${param["redirectType"] eq "forward"}'>

Modified: struts/el/trunk/web/exercise-taglib/showSource.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/showSource.jsp?rev=230663&r1=230662&r2=230663&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/showSource.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/showSource.jsp Sun Aug  7 05:55:28 2005
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%@ page language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html-el.tld"  prefix="html-el"  %>
-<%@ taglib uri="/WEB-INF/struts-bean-el.tld"  prefix="bean-el"  %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html-el"  prefix="html-el"  %>
+<%@ taglib uri="http://struts.apache.org/tags-bean-el"  prefix="bean-el"  %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <html-el:html>
  <head>
   <title>Source for page: <c:out value="${param.path}"/></title>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org