svn commit: r512836 - in /struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp: WEB-INF/struts-config.xml logic-compare.jsp logic-redirect.jsp

[niallp]

Author: niallp
Date: Wed Feb 28 08:38:32 2007
New Revision: 512836

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

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

Modified: 
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml?view=diff&rev=512836&r1=512835&r2=512836
==============================================================================
--- 
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml
 (original)
+++ 
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/WEB-INF/struts-config.xml
 Wed Feb 28 08:38:32 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/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-compare.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-compare.jsp?view=diff&rev=512836&r1=512835&r2=512836
==============================================================================
--- 
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-compare.jsp
 (original)
+++ 
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-compare.jsp
 Wed Feb 28 08:38:32 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/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-redirect.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-redirect.jsp?view=diff&rev=512836&r1=512835&r2=512836
==============================================================================
--- 
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-redirect.jsp
 (original)
+++ 
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/logic-redirect.jsp
 Wed Feb 28 08:38:32 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>