You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2004/02/13 01:01:38 UTC

cvs commit: jakarta-velocity-tools/examples/struts/examples/struts_app5 validator-demo.vm

nbubna      2004/02/12 16:01:38

  Modified:    examples/struts/WEB-INF VM_global_library.vm toolbox.xml
               examples/struts/examples/struts_app1 edit-address.txt
                        edit-address.vm show-address.txt show-address.vm
               examples/struts/examples/struts_app2 tool-demo.txt
                        tool-demo.vm
               examples/struts/examples/struts_app5 validator-demo.vm
  Log:
  use new recommended keys ($text and $messages)
  
  Revision  Changes    Path
  1.3       +4 -4      jakarta-velocity-tools/examples/struts/WEB-INF/VM_global_library.vm
  
  Index: VM_global_library.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/WEB-INF/VM_global_library.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VM_global_library.vm	11 Feb 2004 23:58:11 -0000	1.2
  +++ VM_global_library.vm	13 Feb 2004 00:01:38 -0000	1.3
  @@ -23,9 +23,9 @@
   
   ## Display all queued Struts errors
   #macro (messageMarkup)
  -    #if ($actionmsgs.exist() )
  +    #if ($messages.exist() )
           <ul>
  -        #foreach ($m in $actionmsgs.all )
  +        #foreach ($m in $messages.all )
               $m
           #end
           </ul>
  @@ -34,9 +34,9 @@
   
   ## Display all queued Struts action messages for a particular property
   #macro (messageMarkupForProperty $property)
  -    #if ($actionmsgs.exist($property) )
  +    #if ($messages.exist($property) )
           <ul>
  -        #foreach ($m in $actionmsgs.get($property))
  +        #foreach ($m in $messages.get($property))
               $m
           #end
           </ul>
  
  
  
  1.5       +2 -2      jakarta-velocity-tools/examples/struts/WEB-INF/toolbox.xml
  
  Index: toolbox.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/WEB-INF/toolbox.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- toolbox.xml	11 Feb 2004 23:58:48 -0000	1.4
  +++ toolbox.xml	13 Feb 2004 00:01:38 -0000	1.5
  @@ -22,7 +22,7 @@
     </tool>
   
     <tool>
  -     <key>msg</key>
  +     <key>text</key>
        <class>org.apache.velocity.tools.struts.MessageTool</class>
     </tool>
   
  @@ -32,7 +32,7 @@
     </tool>
   
     <tool>
  -     <key>actionmsgs</key>
  +     <key>messages</key>
        <class>org.apache.velocity.tools.struts.ActionMessagesTool</class>
     </tool>
   
  
  
  
  1.3       +18 -18    jakarta-velocity-tools/examples/struts/examples/struts_app1/edit-address.txt
  
  Index: edit-address.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app1/edit-address.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- edit-address.txt	27 Jan 2004 18:32:00 -0000	1.2
  +++ edit-address.txt	13 Feb 2004 00:01:38 -0000	1.3
  @@ -1,60 +1,60 @@
   <html>
       <head>
  -    	<title>$msg.get("title")</title>
  +    	<title>$text.get("title")</title>
       	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
       </head>
   
       <body>
  -        <p><b>$msg.get("edit") (Velocity $msg.get("version"))</b></p>
  +        <p><b>$text.get("edit") (Velocity $text.get("version"))</b></p>
   
           <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>
  -        		<td>$msg.get("firstname")</td>
  +        		<td>$text.get("firstname")</td>
           		<td><input type="text" name="firstname" value="$!address.firstname"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("lastname")</td>
  +        		<td>$text.get("lastname")</td>
           		<td><input type="text" name="lastname" value="$!address.lastname"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("street")</td>
  +        		<td>$text.get("street")</td>
           		<td><input type="text" name="street" value="$!address.street"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("zip")</td>
  +        		<td>$text.get("zip")</td>
           		<td><input type="text" name="zip" value="$!address.zip"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("city")</td>
  +        		<td>$text.get("city")</td>
           		<td><input type="text" name="city" value="$!address.city"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("country")</td>
  +        		<td>$text.get("country")</td>
           		<td><input type="text" name="country" value="$!address.country"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("languages")</td>
  +        		<td>$text.get("languages")</td>
           		<td>
           		    #set ($map = $address.languagesAsMap)
           		    <select name="languages" MULTIPLE size="5">
  -        		        <option value="chinese" $map.getProperty("chinese", "")>$msg.get("chinese")</option>
  -        		        <option value="english" $map.getProperty("english", "")>$msg.get("english")</option>
  -        		        <option value="french" $map.getProperty("french", "")>$msg.get("french")</option>
  -        		        <option value="german" $map.getProperty("german", "")>$msg.get("german")</option>
  -        		        <option value="russian" $map.getProperty("russian", "")>$msg.get("russian")</option>
  -        		        <option value="spanish" $map.getProperty("spanish", "")>$msg.get("spanish")</option>
  +        		        <option value="chinese" $map.getProperty("chinese", "")>$text.get("chinese")</option>
  +        		        <option value="english" $map.getProperty("english", "")>$text.get("english")</option>
  +        		        <option value="french" $map.getProperty("french", "")>$text.get("french")</option>
  +        		        <option value="german" $map.getProperty("german", "")>$text.get("german")</option>
  +        		        <option value="russian" $map.getProperty("russian", "")>$text.get("russian")</option>
  +        		        <option value="spanish" $map.getProperty("spanish", "")>$text.get("spanish")</option>
           		    </select>
  -        		    <br>$msg.get("multiple")
  +        		    <br>$text.get("multiple")
           		</td>
           	</tr>
           </table>
           <br>
   
  -        <input type="submit" name="Submit" value="  $msg.get("save")  " onclick="address.action.value='save'; document.address.submit(); return false;">
  -        <input type="submit" name="Submit2" value="$msg.get("cancel")"  onclick="address.action.value='list'; document.address.submit(); return false;">
  +        <input type="submit" name="Submit" value="  $text.get("save")  " onclick="address.action.value='save'; document.address.submit(); return false;">
  +        <input type="submit" name="Submit2" value="$text.get("cancel")"  onclick="address.action.value='list'; document.address.submit(); return false;">
           </form>
   
           <br>
  
  
  
  1.3       +18 -18    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- edit-address.vm	27 Jan 2004 00:09:37 -0000	1.2
  +++ edit-address.vm	13 Feb 2004 00:01:38 -0000	1.3
  @@ -1,60 +1,60 @@
   <html>
       <head>
  -    	<title>$msg.get("title")</title>
  +    	<title>$text.get("title")</title>
       	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
       </head>
   
       <body>
  -        <p><b>$msg.get("edit") (Velocity $msg.get("version"))</b></p>
  +        <p><b>$text.get("edit") (Velocity $text.get("version"))</b></p>
   
           <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>
  -        		<td>$msg.get("firstname")</td>
  +        		<td>$text.get("firstname")</td>
           		<td><input type="text" name="firstname" value="$!address.firstname"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("lastname")</td>
  +        		<td>$text.get("lastname")</td>
           		<td><input type="text" name="lastname" value="$!address.lastname"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("street")</td>
  +        		<td>$text.get("street")</td>
           		<td><input type="text" name="street" value="$!address.street"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("zip")</td>
  +        		<td>$text.get("zip")</td>
           		<td><input type="text" name="zip" value="$!address.zip"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("city")</td>
  +        		<td>$text.get("city")</td>
           		<td><input type="text" name="city" value="$!address.city"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("country")</td>
  +        		<td>$text.get("country")</td>
           		<td><input type="text" name="country" value="$!address.country"></td>
           	</tr>
           	<tr>
  -        		<td>$msg.get("languages")</td>
  +        		<td>$text.get("languages")</td>
           		<td>
           		    #set ($map = $address.languagesAsMap)
           		    <select name="languages" MULTIPLE size="5">
  -        		        <option value="chinese" $map.getProperty("chinese", "")>$msg.get("chinese")</option>
  -        		        <option value="english" $map.getProperty("english", "")>$msg.get("english")</option>
  -        		        <option value="french" $map.getProperty("french", "")>$msg.get("french")</option>
  -        		        <option value="german" $map.getProperty("german", "")>$msg.get("german")</option>
  -        		        <option value="russian" $map.getProperty("russian", "")>$msg.get("russian")</option>
  -        		        <option value="spanish" $map.getProperty("spanish", "")>$msg.get("spanish")</option>
  +        		        <option value="chinese" $map.getProperty("chinese", "")>$text.get("chinese")</option>
  +        		        <option value="english" $map.getProperty("english", "")>$text.get("english")</option>
  +        		        <option value="french" $map.getProperty("french", "")>$text.get("french")</option>
  +        		        <option value="german" $map.getProperty("german", "")>$text.get("german")</option>
  +        		        <option value="russian" $map.getProperty("russian", "")>$text.get("russian")</option>
  +        		        <option value="spanish" $map.getProperty("spanish", "")>$text.get("spanish")</option>
           		    </select>
  -        		    <br>$msg.get("multiple")
  +        		    <br>$text.get("multiple")
           		</td>
           	</tr>
           </table>
           <br>
   
  -        <input type="submit" name="Submit" value="  $msg.get("save")  " onclick="address.action.value='save'; document.address.submit(); return false;">
  -        <input type="submit" name="Submit2" value="$msg.get("cancel")"  onclick="address.action.value='list'; document.address.submit(); return false;">
  +        <input type="submit" name="Submit" value="  $text.get("save")  " onclick="address.action.value='save'; document.address.submit(); return false;">
  +        <input type="submit" name="Submit2" value="$text.get("cancel")"  onclick="address.action.value='list'; document.address.submit(); return false;">
           </form>
   
           <br>
  
  
  
  1.3       +15 -15    jakarta-velocity-tools/examples/struts/examples/struts_app1/show-address.txt
  
  Index: show-address.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app1/show-address.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- show-address.txt	27 Jan 2004 18:32:00 -0000	1.2
  +++ show-address.txt	13 Feb 2004 00:01:38 -0000	1.3
  @@ -1,16 +1,16 @@
   <html>
   	<head>
  -		<title>$msg.get("title")</title>
  +		<title>$text.get("title")</title>
   		<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><b>$text.get("title") (Velocity $text.get("version"))</b></p>
   
  -		<p>$msg.get("intro")</p>
  +		<p>$text.get("intro")</p>
   
   		<form name="form1" method="GET" action="address2.do">
  -		<p>$msg.get("language")
  +		<p>$text.get("language")
   		<select name="locale" size="1" onchange="form1.submit(); return false;">
   			<option value="" SELECTED></option>
   			<option value="English">English</option>
  @@ -18,37 +18,37 @@
   		</select>
   		</p></form>
   
  -		<p>$msg.get("header")</p>
  +		<p>$text.get("header")</p>
   		<table width="300" border="1" cellspacing="" cellpadding="5">
   			<tr>
  -				<td>$msg.get("firstname")</td>
  +				<td>$text.get("firstname")</td>
   				<td>&nbsp; $!address.firstname </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("lastname")</td>
  +				<td>$text.get("lastname")</td>
   				<td>&nbsp; $!address.lastname </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("street")</td>
  +				<td>$text.get("street")</td>
   				<td>&nbsp; $!address.street </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("zip")</td>
  +				<td>$text.get("zip")</td>
   				<td>&nbsp; $!address.zip </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("city")</td>
  +				<td>$text.get("city")</td>
   				<td>&nbsp; $!address.city </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("country")</td>
  +				<td>$text.get("country")</td>
   				<td>&nbsp; $!address.country </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("languages")</td>
  +				<td>$text.get("languages")</td>
   				<td>
   					#foreach ($language in $!address.languages)
  -						&nbsp; $msg.get($language)<br>
  +						&nbsp; $text.get($language)<br>
   					#end
   					&nbsp;
   				</td>
  @@ -56,8 +56,8 @@
   		</table>
   
   		<br>
  -		<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)
  +		<a href="$link.setAction("address1").addQueryData("action","edit")">$text.get("edit")</a> (JSP)<br><br>
  +		<a href="$link.setAction("address2").addQueryData("action","edit")">$text.get("edit")</a> (Velocity)
   
   		<br><br>
   		<a href="$link.setForward("showAddressSrc")">Template</a>
  
  
  
  1.3       +15 -15    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- show-address.vm	27 Jan 2004 00:09:37 -0000	1.2
  +++ show-address.vm	13 Feb 2004 00:01:38 -0000	1.3
  @@ -1,16 +1,16 @@
   <html>
   	<head>
  -		<title>$msg.get("title")</title>
  +		<title>$text.get("title")</title>
   		<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><b>$text.get("title") (Velocity $text.get("version"))</b></p>
   
  -		<p>$msg.get("intro")</p>
  +		<p>$text.get("intro")</p>
   
   		<form name="form1" method="GET" action="$link.setAction("address2")">
  -		<p>$msg.get("language")
  +		<p>$text.get("language")
   		<select name="locale" size="1" onchange="form1.submit(); return false;">
   			<option value="" SELECTED></option>
   			<option value="English">English</option>
  @@ -18,37 +18,37 @@
   		</select>
   		</p></form>
   
  -		<p>$msg.get("header")</p>
  +		<p>$text.get("header")</p>
   		<table width="300" border="1" cellspacing="" cellpadding="5">
   			<tr>
  -				<td>$msg.get("firstname")</td>
  +				<td>$text.get("firstname")</td>
   				<td>&nbsp; $!address.firstname </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("lastname")</td>
  +				<td>$text.get("lastname")</td>
   				<td>&nbsp; $!address.lastname </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("street")</td>
  +				<td>$text.get("street")</td>
   				<td>&nbsp; $!address.street </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("zip")</td>
  +				<td>$text.get("zip")</td>
   				<td>&nbsp; $!address.zip </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("city")</td>
  +				<td>$text.get("city")</td>
   				<td>&nbsp; $!address.city </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("country")</td>
  +				<td>$text.get("country")</td>
   				<td>&nbsp; $!address.country </td>
   			</tr>
   			<tr>
  -				<td>$msg.get("languages")</td>
  +				<td>$text.get("languages")</td>
   				<td>
   					#foreach ($language in $!address.languages)
  -						&nbsp; $msg.get($language)<br>
  +						&nbsp; $text.get($language)<br>
   					#end
   					&nbsp;
   				</td>
  @@ -56,8 +56,8 @@
   		</table>
   
   		<br>
  -		<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)
  +		<a href="$link.setAction("address1").addQueryData("action","edit")">$text.get("edit")</a> (JSP)<br><br>
  +		<a href="$link.setAction("address2").addQueryData("action","edit")">$text.get("edit")</a> (Velocity)
   
   		<br><br>
   		<a href="$link.setForward("showAddressSrc")">Template</a>
  
  
  
  1.3       +32 -32    jakarta-velocity-tools/examples/struts/examples/struts_app2/tool-demo.txt
  
  Index: tool-demo.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app2/tool-demo.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tool-demo.txt	12 Feb 2004 00:20:25 -0000	1.2
  +++ tool-demo.txt	13 Feb 2004 00:01:38 -0000	1.3
  @@ -15,23 +15,23 @@
           <h3>MessageTool</h3>
           <table border="1" cellspacing="0" cellpadding="4">
               <tr>
  -                <td>\$msg.get("title")<br>
  -                    \$msg.title</td>
  -                <td>$msg.get("title")</td>
  +                <td>\$text.get("title")<br>
  +                    \$text.title</td>
  +                <td>$text.get("title")</td>
               </tr>
               <tr>
  -                <td>\$msg.get("test", ["bear", "dog", "cat"])</td>
  -                <td>$msg.get("test", ["bear", "dog", "cat"])</td>
  +                <td>\$text.get("test", ["bear", "dog", "cat"])</td>
  +                <td>$text.get("test", ["bear", "dog", "cat"])</td>
               </tr>
               <tr>
  -                <td>\$msg.exists("tutle")</td>
  -                <td>$msg.exists("tutle")</td>
  +                <td>\$text.exists("tutle")</td>
  +                <td>$text.exists("tutle")</td>
               </tr>
               <tr>
               <tr>
  -                <td>\$msg.getLocale()<br>
  -                    \$msg.locale</td>
  -                <td>$msg.getLocale()</td>
  +                <td>\$text.getLocale()<br>
  +                    \$text.locale</td>
  +                <td>$text.getLocale()</td>
               </tr>
           </table>
   
  @@ -69,7 +69,7 @@
               </tr>
               <tr>
                   <td>\$errors.getMsgs()<br>
  -                    \$errors.msgs</td>
  +                    \$errors.texts</td>
                   <td>$errors.getMsgs()</td>
               </tr>
               <tr>
  @@ -195,40 +195,40 @@
           <h3>ActionMessagesTool</h3>
           <table border="1" cellspacing="0" cellpadding="4">
               <tr>
  -                <td>\$actionmsgs.exist()</td>
  -                <td>$actionmsgs.exist()</td>
  +                <td>\$messages.exist()</td>
  +                <td>$messages.exist()</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.exist("foobar")</td>
  -                <td>$actionmsgs.exist("foobar")</td>
  +                <td>\$messages.exist("foobar")</td>
  +                <td>$messages.exist("foobar")</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.getSize()<br>
  -                    \$actionmsgs.size</td>
  -                <td>$actionmsgs.getSize()</td>
  +                <td>\$messages.getSize()<br>
  +                    \$messages.size</td>
  +                <td>$messages.getSize()</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.getSize("foobar")</td>
  -                <td>$actionmsgs.getSize("foobar")</td>
  +                <td>\$messages.getSize("foobar")</td>
  +                <td>$messages.getSize("foobar")</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.getAll()<br>
  -                    \$actionmsgs.all</td>
  +                <td>\$messages.getAll()<br>
  +                    \$messages.all</td>
                   <td>[This is a String representation of the ArrayList that is returned]<br>
  -                    $actionmsgs.getAll()</td>
  +                    $messages.getAll()</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.get("foobar")<br>
  -                    \$actionmsgs.language</td>
  +                <td>\$messages.get("foobar")<br>
  +                    \$messages.language</td>
                   <td>[This is a String representation of the ArrayList that is returned]<br>
  -                    $actionmsgs.get("foobar")</td>
  +                    $messages.get("foobar")</td>
               </tr>
               <tr>
  -                <td>A Velocity macro to render all actionmsg messages:<br>
  +                <td>A Velocity macro to render all actiontext messages:<br>
   <pre><code>&#35;macro (messageMarkup)
  -  &#35;if (&#36;actionmsgs.exist() )
  +  &#35;if (&#36;messages.exist() )
       &lt;ul&gt;
  -    &#35;foreach (&#36;m in &#36;actionmsgs.all )
  +    &#35;foreach (&#36;m in &#36;messages.all )
         &#36;m
       &#35;end
       &lt;/ul&gt;
  @@ -240,12 +240,12 @@
                   </td>
               </tr>
               <tr>
  -                <td>A Velocity macro to render actionmsg messages specific<br>
  +                <td>A Velocity macro to render actiontext messages specific<br>
                       to a property:<br>
   <pre><code>&#35;macro (messageMarkup &#36;property)
  -  &#35;if (&#36;actionmsgs.exist(&#36;property))
  +  &#35;if (&#36;messages.exist(&#36;property))
       &lt;ul&gt;
  -    &#35;foreach (&#36;m in &#36;actionmsgs.get(&#36;property))
  +    &#35;foreach (&#36;m in &#36;messages.get(&#36;property))
         &#36;m
       &#35;end
       &lt;/ul&gt;
  
  
  
  1.3       +32 -32    jakarta-velocity-tools/examples/struts/examples/struts_app2/tool-demo.vm
  
  Index: tool-demo.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app2/tool-demo.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tool-demo.vm	12 Feb 2004 00:20:25 -0000	1.2
  +++ tool-demo.vm	13 Feb 2004 00:01:38 -0000	1.3
  @@ -15,23 +15,23 @@
           <h3>MessageTool</h3>
           <table border="1" cellspacing="0" cellpadding="4">
               <tr>
  -                <td>\$msg.get("title")<br>
  -                    \$msg.title</td>
  -                <td>$msg.get("title")</td>
  +                <td>\$text.get("title")<br>
  +                    \$text.title</td>
  +                <td>$text.get("title")</td>
               </tr>
               <tr>
  -                <td>\$msg.get("test", ["bear", "dog", "cat"])</td>
  -                <td>$msg.get("test", ["bear", "dog", "cat"])</td>
  +                <td>\$text.get("test", ["bear", "dog", "cat"])</td>
  +                <td>$text.get("test", ["bear", "dog", "cat"])</td>
               </tr>
               <tr>
  -                <td>\$msg.exists("tutle")</td>
  -                <td>$msg.exists("tutle")</td>
  +                <td>\$text.exists("tutle")</td>
  +                <td>$text.exists("tutle")</td>
               </tr>
               <tr>
               <tr>
  -                <td>\$msg.getLocale()<br>
  -                    \$msg.locale</td>
  -                <td>$msg.getLocale()</td>
  +                <td>\$text.getLocale()<br>
  +                    \$text.locale</td>
  +                <td>$text.getLocale()</td>
               </tr>
           </table>
   
  @@ -69,7 +69,7 @@
               </tr>
               <tr>
                   <td>\$errors.getMsgs()<br>
  -                    \$errors.msgs</td>
  +                    \$errors.texts</td>
                   <td>$errors.getMsgs()</td>
               </tr>
               <tr>
  @@ -195,40 +195,40 @@
           <h3>ActionMessagesTool</h3>
           <table border="1" cellspacing="0" cellpadding="4">
               <tr>
  -                <td>\$actionmsgs.exist()</td>
  -                <td>$actionmsgs.exist()</td>
  +                <td>\$messages.exist()</td>
  +                <td>$messages.exist()</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.exist("foobar")</td>
  -                <td>$actionmsgs.exist("foobar")</td>
  +                <td>\$messages.exist("foobar")</td>
  +                <td>$messages.exist("foobar")</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.getSize()<br>
  -                    \$actionmsgs.size</td>
  -                <td>$actionmsgs.getSize()</td>
  +                <td>\$messages.getSize()<br>
  +                    \$messages.size</td>
  +                <td>$messages.getSize()</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.getSize("foobar")</td>
  -                <td>$actionmsgs.getSize("foobar")</td>
  +                <td>\$messages.getSize("foobar")</td>
  +                <td>$messages.getSize("foobar")</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.getAll()<br>
  -                    \$actionmsgs.all</td>
  +                <td>\$messages.getAll()<br>
  +                    \$messages.all</td>
                   <td>[This is a String representation of the ArrayList that is returned]<br>
  -                    $actionmsgs.getAll()</td>
  +                    $messages.getAll()</td>
               </tr>
               <tr>
  -                <td>\$actionmsgs.get("foobar")<br>
  -                    \$actionmsgs.language</td>
  +                <td>\$messages.get("foobar")<br>
  +                    \$messages.language</td>
                   <td>[This is a String representation of the ArrayList that is returned]<br>
  -                    $actionmsgs.get("foobar")</td>
  +                    $messages.get("foobar")</td>
               </tr>
               <tr>
  -                <td>A Velocity macro to render all actionmsg messages:<br>
  +                <td>A Velocity macro to render all actiontext messages:<br>
   <pre><code>&#35;macro (messageMarkup)
  -  &#35;if (&#36;actionmsgs.exist() )
  +  &#35;if (&#36;messages.exist() )
       &lt;ul&gt;
  -    &#35;foreach (&#36;m in &#36;actionmsgs.all )
  +    &#35;foreach (&#36;m in &#36;messages.all )
         &#36;m
       &#35;end
       &lt;/ul&gt;
  @@ -240,12 +240,12 @@
                   </td>
               </tr>
               <tr>
  -                <td>A Velocity macro to render actionmsg messages specific<br>
  +                <td>A Velocity macro to render actiontext messages specific<br>
                       to a property:<br>
   <pre><code>&#35;macro (messageMarkup &#36;property)
  -  &#35;if (&#36;actionmsgs.exist(&#36;property))
  +  &#35;if (&#36;messages.exist(&#36;property))
       &lt;ul&gt;
  -    &#35;foreach (&#36;m in &#36;actionmsgs.get(&#36;property))
  +    &#35;foreach (&#36;m in &#36;messages.get(&#36;property))
         &#36;m
       &#35;end
       &lt;/ul&gt;
  
  
  
  1.3       +1 -1      jakarta-velocity-tools/examples/struts/examples/struts_app5/validator-demo.vm
  
  Index: validator-demo.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/examples/struts_app5/validator-demo.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- validator-demo.vm	28 Jan 2004 22:51:06 -0000	1.2
  +++ validator-demo.vm	13 Feb 2004 00:01:38 -0000	1.3
  @@ -11,7 +11,7 @@
   	#errorMarkup()
   
           <form name="emailForm" action='$link.setAction("do_submit_vm")' method="post" onsubmit="return validateEmailForm(this)">
  -            $msg.get("emailForm.label.email") &nbsp; <input type="text" name="email" value="$!emailForm.email"/>&nbsp;
  +            $text.get("emailForm.label.email") &nbsp; <input type="text" name="email" value="$!emailForm.email"/>&nbsp;
               <input type="submit" name="submit"/>
   	</form>
   
  
  
  

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