Author: niallp
Date: Mon May 29 21:43:05 2006
New Revision: 410186
URL: http://svn.apache.org/viewvc?rev=410186&view=rev
Log:
Fix TLD URIs and configure cancellable property.
Modified:
struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
struts/action/trunk/apps/faces-example1/src/main/webapp/changePassword.jsp
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
struts/action/trunk/apps/faces-example2/src/main/webapp/changePassword.jsp
struts/action/trunk/apps/faces-example2/src/main/webapp/staticJavascript.jsp
struts/action/trunk/apps/faces-example2/src/main/webapp/welcome.jsp
Modified:
struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml?rev=410186&r1=410185&r2=410186&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
Mon May 29 21:43:05 2006
@@ -138,6 +138,7 @@
type="org.apache.struts.webapp.example.SaveRegistrationAction"
name="registrationForm"
scope="request"
+ cancellable="true"
input="registration">
</action>
@@ -146,6 +147,7 @@
type="org.apache.struts.webapp.example.SaveSubscriptionAction"
name="subscriptionForm"
scope="request"
+ cancellable="true"
input="subscription">
<forward name="success" path="/editRegistration.do?action=Edit"/>
</action>
Modified:
struts/action/trunk/apps/faces-example1/src/main/webapp/changePassword.jsp
URL:
http://svn.apache.org/viewvc/struts/action/trunk/apps/faces-example1/src/main/webapp/changePassword.jsp?rev=410186&r1=410185&r2=410186&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example1/src/main/webapp/changePassword.jsp
(original)
+++ struts/action/trunk/apps/faces-example1/src/main/webapp/changePassword.jsp
Mon May 29 21:43:05 2006
@@ -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="http://struts.apache.org/tags-html"; prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<!--
Modified:
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml?rev=410186&r1=410185&r2=410186&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
Mon May 29 21:43:05 2006
@@ -144,6 +144,7 @@
type="org.apache.struts.webapp.example2.SaveRegistrationAction"
name="registrationForm"
scope="request"
+ cancellable="true"
input="registration"/>
<!-- Save mail subscription -->
@@ -151,6 +152,7 @@
type="org.apache.struts.webapp.example2.SaveSubscriptionAction"
name="subscriptionForm"
scope="request"
+ cancellable="true"
input="subscription">
<forward name="success" path="/editRegistration.do?action=Edit"/>
</action>
Modified:
struts/action/trunk/apps/faces-example2/src/main/webapp/changePassword.jsp
URL:
http://svn.apache.org/viewvc/struts/action/trunk/apps/faces-example2/src/main/webapp/changePassword.jsp?rev=410186&r1=410185&r2=410186&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/src/main/webapp/changePassword.jsp
(original)
+++ struts/action/trunk/apps/faces-example2/src/main/webapp/changePassword.jsp
Mon May 29 21:43:05 2006
@@ -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="http://struts.apache.org/tags-html"; prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<!--
Modified:
struts/action/trunk/apps/faces-example2/src/main/webapp/staticJavascript.jsp
URL:
http://svn.apache.org/viewvc/struts/action/trunk/apps/faces-example2/src/main/webapp/staticJavascript.jsp?rev=410186&r1=410185&r2=410186&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/webapp/staticJavascript.jsp
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/webapp/staticJavascript.jsp
Mon May 29 21:43:05 2006
@@ -21,6 +21,6 @@
--%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
<html:javascript dynamicJavascript="false" staticJavascript="true"/>
Modified: struts/action/trunk/apps/faces-example2/src/main/webapp/welcome.jsp
URL:
http://svn.apache.org/viewvc/struts/action/trunk/apps/faces-example2/src/main/webapp/welcome.jsp?rev=410186&r1=410185&r2=410186&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/src/main/webapp/welcome.jsp
(original)
+++ struts/action/trunk/apps/faces-example2/src/main/webapp/welcome.jsp Mon May
29 21:43:05 2006
@@ -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="http://struts.apache.org/tags-bean"; prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<!--
