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 19:32:02 UTC
cvs commit: jakarta-velocity-tools/examples/struts/examples/struts_app3 index.jsp index.vm index_jsp.txt index_vm.txt logon_jsp.txt logon_vm.txt
marino 2004/01/27 10:32:02
Modified: examples/struts/examples/struts_app3 index.jsp index.vm
index_jsp.txt index_vm.txt logon_jsp.txt
logon_vm.txt
Log:
txt versions updated and small fix to the config
Revision Changes Path
1.2 +6 -6 jakarta-velocity-tools/examples/struts/examples/struts_app3/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app3/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.jsp 5 Mar 2003 06:36:36 -0000 1.1
+++ index.jsp 27 Jan 2004 18:32:02 -0000 1.2
@@ -10,7 +10,7 @@
Display link to log in page; maintain session id if needed.
If user is logged in, display a link to the sign-out page.
-Note: Only the minimum required html or Sruts custom tags
+Note: Only the minimum required html or Sruts custom tags
are used in this example.
--%>
@@ -25,13 +25,13 @@
<logic:present name="user">
<h3>Welcome <bean:write name="user" property="username"/>! (JSP Version)</h3>
</logic:present>
-
+
<logic:notPresent scope="session" name="user">
<h3>Welcome World! (JSP Version)</h3>
</logic:notPresent>
-
+
<html:errors/>
-
+
<ul>
<li><html:link forward="logon_jsp">Sign in</html:link></li>
<logic:present name="user">
@@ -40,8 +40,8 @@
</ul>
<html:link forward="welcome_vm">Switch to Velocity</html:link><br>
- <a href="index_jsp.txt">View Template</a><br>
-
+ <html:link forward="index_jsp_src">View Template</html:link><br>
+
</body>
</html>
1.4 +1 -1 jakarta-velocity-tools/examples/struts/examples/struts_app3/index.vm
Index: index.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app3/index.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.vm 27 Jan 2004 00:09:41 -0000 1.3
+++ index.vm 27 Jan 2004 18:32:02 -0000 1.4
@@ -42,7 +42,7 @@
</ul>
<a href="$link.setAction('welcome_jsp')">Switch to JSP</a><br>
- <a href="index_vm.txt">View Template</a><br>
+ <a href="$link.setAction('index_vm_src')">View Template</a><br>
</body>
1.2 +6 -6 jakarta-velocity-tools/examples/struts/examples/struts_app3/index_jsp.txt
Index: index_jsp.txt
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app3/index_jsp.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index_jsp.txt 5 Mar 2003 06:36:36 -0000 1.1
+++ index_jsp.txt 27 Jan 2004 18:32:02 -0000 1.2
@@ -10,7 +10,7 @@
Display link to log in page; maintain session id if needed.
If user is logged in, display a link to the sign-out page.
-Note: Only the minimum required html or Sruts custom tags
+Note: Only the minimum required html or Sruts custom tags
are used in this example.
--%>
@@ -25,13 +25,13 @@
<logic:present name="user">
<h3>Welcome <bean:write name="user" property="username"/>! (JSP Version)</h3>
</logic:present>
-
+
<logic:notPresent scope="session" name="user">
<h3>Welcome World! (JSP Version)</h3>
</logic:notPresent>
-
+
<html:errors/>
-
+
<ul>
<li><html:link forward="logon_jsp">Sign in</html:link></li>
<logic:present name="user">
@@ -40,8 +40,8 @@
</ul>
<html:link forward="welcome_vm">Switch to Velocity</html:link><br>
- <a href="index_jsp.txt">View Template</a><br>
-
+ <html:link forward="index_jsp_src">View Template</html:link><br>
+
</body>
</html>
1.2 +5 -5 jakarta-velocity-tools/examples/struts/examples/struts_app3/index_vm.txt
Index: index_vm.txt
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app3/index_vm.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index_vm.txt 5 Mar 2003 06:36:36 -0000 1.1
+++ index_vm.txt 27 Jan 2004 18:32:02 -0000 1.2
@@ -5,7 +5,7 @@
Display link to log in page; maintain session id if needed.
If user is logged in, display a link to the sign-out page.
-Note: Only the minimum required html or Sruts custom tags
+Note: Only the minimum required html or Sruts custom tags
are used in this example.
*#
@@ -31,9 +31,9 @@
#end
</ul>
#end
- #end
+ #end
#errorMarkup()
-
+
<ul>
<li><a href="$link.setForward('logon_vm')">Sign in</a></li>
#if( $user )
@@ -42,8 +42,8 @@
</ul>
<a href="$link.setAction('/welcome_jsp')">Switch to JSP</a><br>
- <a href="index_vm.txt">View Template</a><br>
-
+ <a href="$link.setAction('index_vm_src')">View Template</a><br>
+
</body>
</html>
1.2 +8 -8 jakarta-velocity-tools/examples/struts/examples/struts_app3/logon_jsp.txt
Index: logon_jsp.txt
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app3/logon_jsp.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logon_jsp.txt 5 Mar 2003 06:36:36 -0000 1.1
+++ logon_jsp.txt 27 Jan 2004 18:32:02 -0000 1.2
@@ -10,11 +10,11 @@
</head>
<body>
-
+
<html:errors/>
<h3>Sign in, Please! (JSP Version)</h3>
-
+
<html:form action="/logonSubmit_jsp" focus="username">
<table border="0">
@@ -27,7 +27,7 @@
<html:text property="username"/>
</td>
</tr>
-
+
<tr>
<th align="right">
Password:
@@ -36,7 +36,7 @@
<html:password property="password"/>
</td>
</tr>
-
+
<tr>
<td align="right">
<html:submit property="submit" value="Submit"/>
@@ -45,14 +45,14 @@
<html:reset/>
</td>
</tr>
-
+
</table>
-
+
</html:form>
- <a href="logon_jsp.txt">View Template</a><br>
+ <html:link forward="logon_jsp_src">View Template</html:link><br>
+
-
</body>
</html>
1.2 +9 -9 jakarta-velocity-tools/examples/struts/examples/struts_app3/logon_vm.txt
Index: logon_vm.txt
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app3/logon_vm.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logon_vm.txt 5 Mar 2003 06:36:36 -0000 1.1
+++ logon_vm.txt 27 Jan 2004 18:32:02 -0000 1.2
@@ -5,12 +5,12 @@
</head>
<body>
-
+
#errorMarkup()
-
+
<h3>Sign in, Please! (Velocity Version)</h3>
- <form method="POST" action="$link.setAction('/logonSubmit_vm')">
+ <form method="POST" action="$link.setAction('logonSubmit_vm')">
<table border="0">
<tr>
@@ -21,7 +21,7 @@
<input type="text" name="username" value="$!logonForm.username">
</td>
</tr>
-
+
<tr>
<th align="right">
Password:
@@ -30,7 +30,7 @@
<input type="password" name="password" value="$!logonForm.password">
</td>
</tr>
-
+
<tr>
<td align="right">
<input type="submit" value="Submit" name="submit">
@@ -39,13 +39,13 @@
<input type="reset" value="Reset" name="reset">
</td>
</tr>
-
+
</table>
-
+
</form>
- <a href="logon_vm.txt">View Template</a><br>
+ <a href="$link.setForward("logon_vm_src")">View Template</a><br>
</body>
-
+
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org