You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ma...@apache.org on 2004/01/27 01:09:37 UTC
cvs commit: jakarta-velocity-tools/examples/struts/examples/struts_app1 edit-address.jsp edit-address.vm show-address.jsp show-address.vm
marino 2004/01/26 16:09:37
Modified: examples/struts/examples/struts_app1 edit-address.jsp
edit-address.vm show-address.jsp show-address.vm
Log:
all links changed to dynamic for struts modules to work
Revision Changes Path
1.2 +14 -15 jakarta-velocity-tools/examples/struts/examples/struts_app1/edit-address.jsp
Index: edit-address.jsp
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app1/edit-address.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit-address.jsp 5 Mar 2003 06:36:35 -0000 1.1
+++ edit-address.jsp 27 Jan 2004 00:09:37 -0000 1.2
@@ -6,50 +6,49 @@
<title>App1</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
-
+
<body>
-
+
<p><b><bean:message key="edit"/> (JSP <bean:message key="version"/>)</b></p>
-
+
<html:form name="address" method="POST" scope="session" type="examples.app1.AddressBean" action="address1.do">
<input type="hidden" name="action" value="list">
-
+
<table width="300" border="1" cellspacing="" cellpadding="5">
- <tr>
+ <tr>
<td><bean:message key="firstname"/>:</td>
<td><html:text name="address" property="firstname"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="lastname"/></td>
<td><html:text name="address" property="lastname"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="street"/></td>
<td><html:text name="address" property="street"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="zip"/></td>
<td><html:text name="address" property="zip"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="city"/></td>
<td><html:text name="address" property="city"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="country"/></td>
<td><html:text name="address" property="country"/></td>
</tr>
</table>
<br>
-
- <input type="submit" name="Submit" value=" <bean:message key="save"/> " onclick="address.action.value='save'; document.address.submit(); return false;">
+
+ <input type="submit" name="Submit" value="<bean:message key="save"/> " onclick="address.action.value='save'; document.address.submit(); return false;">
<input type="submit" name="Submit2" value="<bean:message key="cancel"/>" onclick="address.action.value='list'; document.address.submit(); return false;">
-
+
</html:form>
<br>
- <a href="examples/struts_app1/edit-addressjsp.txt">Template</a>
+ <html:link forward="editAddressSrcJsp">Template</html:link>
-
</body>
</html>
1.2 +14 -14 jakarta-velocity-tools/examples/struts/examples/struts_app1/edit-address.vm
Index: edit-address.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app1/edit-address.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- edit-address.vm 5 Mar 2003 06:36:35 -0000 1.1
+++ edit-address.vm 27 Jan 2004 00:09:37 -0000 1.2
@@ -3,39 +3,39 @@
<title>$msg.get("title")</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
-
- <body>
+
+ <body>
<p><b>$msg.get("edit") (Velocity $msg.get("version"))</b></p>
-
- <form name="address" method="GET" action="address2.do">
+
+ <form name="address" method="GET" action="$link.setAction("address2")">
<input type="hidden" name="action" value="list">
-
+
<table width="300" border="1" cellspacing="" cellpadding="5">
- <tr>
+ <tr>
<td>$msg.get("firstname")</td>
<td><input type="text" name="firstname" value="$!address.firstname"></td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("lastname")</td>
<td><input type="text" name="lastname" value="$!address.lastname"></td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("street")</td>
<td><input type="text" name="street" value="$!address.street"></td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("zip")</td>
<td><input type="text" name="zip" value="$!address.zip"></td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("city")</td>
<td><input type="text" name="city" value="$!address.city"></td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("country")</td>
<td><input type="text" name="country" value="$!address.country"></td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("languages")</td>
<td>
#set ($map = $address.languagesAsMap)
@@ -58,7 +58,7 @@
</form>
<br>
- <a href="examples/struts_app1/edit-address.txt">Template</a>
-
+ <a href="$link.setForward("editAddressSrc")">Template</a>
+
</body>
</html>
1.2 +17 -16 jakarta-velocity-tools/examples/struts/examples/struts_app1/show-address.jsp
Index: show-address.jsp
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app1/show-address.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- show-address.jsp 5 Mar 2003 06:36:35 -0000 1.1
+++ show-address.jsp 27 Jan 2004 00:09:37 -0000 1.2
@@ -1,63 +1,64 @@
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<html>
<head>
<title><bean:message key="title"/> </title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
-
+
<body>
-
+
<jsp:useBean id="address" scope="session" class="examples.app1.AddressBean" />
-
+
<p><b><bean:message key="title"/> (JSP <bean:message key="version"/>)</b></p>
-
+
<p><bean:message key="intro"/></p>
-
+
<form name="form1" action="address1.do">
<p><bean:message key="language"/>
<select name="locale" size="1" onchange="form1.submit(); return false;">
<option value="" SELECTED></option>
- <option value="English">English</option>
+ <option value="English">English</option>
<option value="Deutsch">Deutsch</option>
</select>
</p>
</form>
-
+
<p><bean:message key="header"/></p>
<table width="300" border="1" cellspacing="" cellpadding="5">
- <tr>
+ <tr>
<td><bean:message key="firstname"/></td>
<td> <bean:write name="address" property="firstname"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="lastname"/></td>
<td> <bean:write name="address" property="lastname"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="street"/></td>
<td> <bean:write name="address" property="street"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="zip"/></td>
<td> <bean:write name="address" property="zip"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="city"/></td>
<td> <bean:write name="address" property="city"/></td>
</tr>
- <tr>
+ <tr>
<td><bean:message key="country"/></td>
<td> <bean:write name="address" property="country"/></td>
</tr>
</table>
-
+
<br>
<a href="address1.do?action=edit"><bean:message key="edit"/></a> (JSP)<br><br>
<a href="address2.do?action=edit"><bean:message key="edit"/></a> (Velocity)
<br><br>
- <a href="examples/struts_app1/show-addressjsp.txt">Template</a>
-
+ <html:link forward="showAddressSrcJsp">Template</html:link>
+
</body>
</html>
1.2 +18 -18 jakarta-velocity-tools/examples/struts/examples/struts_app1/show-address.vm
Index: show-address.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app1/show-address.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- show-address.vm 5 Mar 2003 06:36:35 -0000 1.1
+++ show-address.vm 27 Jan 2004 00:09:37 -0000 1.2
@@ -1,50 +1,50 @@
<html>
<head>
<title>$msg.get("title")</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body>
<p><b>$msg.get("title") (Velocity $msg.get("version"))</b></p>
-
+
<p>$msg.get("intro")</p>
-
- <form name="form1" method="GET" action="address2.do">
+
+ <form name="form1" method="GET" action="$link.setAction("address2")">
<p>$msg.get("language")
<select name="locale" size="1" onchange="form1.submit(); return false;">
<option value="" SELECTED></option>
- <option value="English">English</option>
+ <option value="English">English</option>
<option value="Deutsch">Deutsch</option>
</select>
</p></form>
-
+
<p>$msg.get("header")</p>
<table width="300" border="1" cellspacing="" cellpadding="5">
- <tr>
+ <tr>
<td>$msg.get("firstname")</td>
<td> $!address.firstname </td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("lastname")</td>
<td> $!address.lastname </td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("street")</td>
<td> $!address.street </td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("zip")</td>
<td> $!address.zip </td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("city")</td>
<td> $!address.city </td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("country")</td>
<td> $!address.country </td>
</tr>
- <tr>
+ <tr>
<td>$msg.get("languages")</td>
<td>
#foreach ($language in $!address.languages)
@@ -54,13 +54,13 @@
</td>
</tr>
</table>
-
+
<br>
- <a href="address1.do?action=edit">$msg.get("edit")</a> (JSP)<br><br>
- <a href="address2.do?action=edit">$msg.get("edit")</a> (Velocity)
+ <a href="$link.setAction("address1").addQueryData("action","edit")">$msg.get("edit")</a> (JSP)<br><br>
+ <a href="$link.setAction("address2").addQueryData("action","edit")">$msg.get("edit")</a> (Velocity)
<br><br>
- <a href="examples/struts_app1/show-address.txt">Template</a>
-
+ <a href="$link.setForward("showAddressSrc")">Template</a>
+
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org