Return-Path: 
 <commits-return-3285-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@locus.apache.org
Received: (qmail 1711 invoked from network); 28 Feb 2007 16:38:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 28 Feb 2007 16:38:02 -0000
Received: (qmail 57093 invoked by uid 500); 28 Feb 2007 16:38:09 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 57047 invoked by uid 500); 28 Feb 2007 16:38:08 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 57038 invoked by uid 99); 28 Feb 2007 16:38:08 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Feb 2007 08:38:08 -0800
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Feb 2007 08:37:59 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 50E591A981D; Wed, 28 Feb 2007 08:37:39 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r512835 - in
 /struts/struts1/trunk/apps/el-example/src/main/webapp:
 WEB-INF/struts-config.xml logic-compare.jsp logic-redirect.jsp
Date: Wed, 28 Feb 2007 16:37:39 -0000
To: commits@struts.apache.org
From: niallp@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070228163739.50E591A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: niallp
Date: Wed Feb 28 08:37:38 2007
New Revision: 512835

URL: http://svn.apache.org/viewvc?view=rev&rev=512835
Log:
Fix for STR-3011 - EL Example webapp has a number of errors - thanks to Henri Yandell

Modified:
    struts/struts1/trunk/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml
    struts/struts1/trunk/apps/el-example/src/main/webapp/logic-compare.jsp
    struts/struts1/trunk/apps/el-example/src/main/webapp/logic-redirect.jsp

Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml?view=diff&rev=512835&r1=512834&r2=512835
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml (original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml Wed Feb 28 08:37:38 2007
@@ -37,7 +37,7 @@
         <forward name="redirectForward"
                  path="/logic-redirect.jsp?redirectType=forward&amp;param1=index"/>
         <forward name="redirectHref"
-                 path="/logic-redirect.jsp?redirectType=href&amp;param1=/el-example/index.jsp"/>
+                 path="/logic-redirect.jsp?redirectType=href&amp;param1=http://struts.apache.org/"/>
         <forward name="redirectPage"
                  path="/logic-redirect.jsp?redirectType=page&amp;param1=/index.jsp"/>
     </global-forwards>
@@ -105,7 +105,7 @@
                 name="testbean"
                 scope="session"
                 validate="false">
-            <forward name="input" path="/bean-dyna.jsp"/>
+            <forward name="input" path="/html-setters.jsp"/>
         </action>
         <action path="/bean-dyna"
                 type="org.apache.struts.webapp.el.exercise.DynaSetAction"

Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/logic-compare.jsp
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/logic-compare.jsp?view=diff&rev=512835&r1=512834&r2=512835
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/logic-compare.jsp (original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/logic-compare.jsp Wed Feb 28 08:37:38 2007
@@ -606,26 +606,26 @@
 </tr>
 <tr>
     <td>string / NULL</td>
-    <td><c:out value="${bean.nullProperty}" default=""/></td>
+    <td><c:out value="${bean.nullProperty}" default="null"/></td>
     <td>&nbsp;</td>
     <td>equal greaterEqual lessEqual</td>
     <td>
-        <c:if test='${bean.nullProperty eq ""}'>
+        <c:if test='${bean.nullProperty eq null}'>
             equal
         </c:if>
-        <c:if test='${bean.nullProperty ge ""}'>
+        <c:if test='${bean.nullProperty ge null}'>
             greaterEqual
         </c:if>
-        <c:if test='${bean.nullProperty gt ""}'>
+        <c:if test='${bean.nullProperty gt null}'>
             greaterThan
         </c:if>
-        <c:if test='${bean.nullProperty le ""}'>
+        <c:if test='${bean.nullProperty le null}'>
             lessEqual
         </c:if>
-        <c:if test='${bean.nullProperty lt ""}'>
+        <c:if test='${bean.nullProperty lt null}'>
             lessThan
         </c:if>
-        <c:if test='${bean.nullProperty ne ""}'>
+        <c:if test='${bean.nullProperty ne null}'>
             notEqual
         </c:if>
     </td>

Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/logic-redirect.jsp
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/logic-redirect.jsp?view=diff&rev=512835&r1=512834&r2=512835
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/logic-redirect.jsp (original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/logic-redirect.jsp Wed Feb 28 08:37:38 2007
@@ -47,19 +47,19 @@
         <tr>
             <td>
                 Redirect with <html-el:link forward="redirectForward">
-                Forward</html-el:link>
+                Forward</html-el:link> to index page
             </td>
         </tr>
         <tr>
             <td>
                 Redirect with <html-el:link forward="redirectHref">
-                Href</html-el:link>
+                Href</html-el:link> to http:/struts.apache.org/
             </td>
         </tr>
         <tr>
             <td>
                 Redirect with <html-el:link forward="redirectPage">
-                Page</html-el:link>
+                Page</html-el:link> to index page
             </td>
         </tr>
     </table>