svn commit: r510919 - /struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/tour.html

[husted]

Author: husted
Date: Fri Feb 23 04:03:36 2007
New Revision: 510919

URL: http://svn.apache.org/viewvc?view=rev&rev=510919
Log:
WW-1705 Encode example URL in MailReader tour. 

Modified:
    
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/tour.html

Modified: 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/tour.html
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/tour.html?view=diff&rev=510919&r1=510918&r2=510919
==============================================================================
--- 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/tour.html 
(original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/tour.html 
Fri Feb 23 04:03:36 2007
@@ -820,7 +820,7 @@
 </p>
 
 <hr/>
-<pre><code>&lt;#if (actionErrors?exists && actionErrors?size > 0)>
+<pre><code>&lt;#if (actionErrors?exists &amp;&amp; actionErrors?size > 0)>
   &lt;ul>
     &lt;#list actionErrors as error>
       &lt;li>&lt;span class="errorMessage">${error}&lt;/span>&lt;/li>
@@ -837,7 +837,7 @@
 </p>
 
 <hr/>
-<pre><code>&lt;#if (actionErrors?exists && actionErrors?size > 0)>
+<pre><code>&lt;#if (actionErrors?exists &amp;&amp; actionErrors?size > 0)>
   <strong>&lt;table></strong>
     &lt;#list actionErrors as error>
       <strong>&lt;tr>&lt;td></strong>&lt;span 
class="errorMessage">${error}&lt;/span><strong>&lt;/td>&lt;/tr></strong>
@@ -1064,7 +1064,7 @@
 <pre><code>public User <strong>findUser</strong>(String username, String 
password)
   throws <strong>ExpiredPasswordException</strong> {
   User user = <strong>getDatabase().findUser(username)</strong>;
-  if ((user != null) && !user.getPassword().equals(password)) {
+  if ((user != null) &amp;&amp; !user.getPassword().equals(password)) {
     user = null;
   }
   if (user == null) {
@@ -1427,7 +1427,7 @@
   public String <strong>intercept</strong>(ActionInvocation actionInvocation) 
throws Exception {
     Map session = actionInvocation.getInvocationContext().getSession();
     User user = (User) session.get(Constants.USER_KEY);
-    boolean isAuthenticated = (null!=user) && (null!=user.getDatabase());
+    boolean isAuthenticated = (null!=user) &amp;&amp; 
(null!=user.getDatabase());
     if (<strong>isAuthenticated</strong>) {
       return actionInvocation.invoke();
     }