svn commit: r482910 - in /struts/struts1/trunk: apps/el-example/src/main/webapp/html-link.jsp el/src/main/resources/META-INF/tld/struts-html-el.tld taglib/src/main/resources/META-INF/tld/struts-nested.tld

[pbenedict]

Author: pbenedict
Date: Tue Dec  5 21:43:57 2006
New Revision: 482910

URL: http://svn.apache.org/viewvc?view=rev&rev=482910
Log:
STR-746: EL+Nested versions of ParamTag and example

Modified:
    struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp
    struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld
    
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-nested.tld

Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp?view=diff&rev=482910&r1=482909&r2=482910
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp 
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp Tue Dec  
5 21:43:57 2006
@@ -147,6 +147,16 @@
 
 <tr>
     <td colspan="4" align="center">
+        <html-el:link page="/html-link.do" accesskey="3" tabindex="3"
+                      title="String via nested param tag">
+            String via nested param tag
+            <html-el:param name="stringProperty" value="${newValue}" />
+        </html-el:link>
+    </td>
+</tr>
+
+<tr>
+    <td colspan="4" align="center">
         <html-el:link page="/html-link.do" accesskey="4" tabindex="2"
                       paramId="booleanProperty"
                       paramName="testbean"

Modified: 
struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld?view=diff&rev=482910&r1=482909&r2=482910
==============================================================================
--- struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld 
(original)
+++ struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld 
Tue Dec  5 21:43:57 2006
@@ -1972,6 +1972,7 @@
     <tag>
         <name>frame</name>
         <tag-class>org.apache.strutsel.taglib.html.ELFrameTag</tag-class>
+        <body-content>JSP</body-content>
         <description>
             <![CDATA[
             <p><strong>Render an HTML frame element</strong></p>
@@ -4007,6 +4008,7 @@
     <tag>
         <name>link</name>
         <tag-class>org.apache.strutsel.taglib.html.ELLinkTag</tag-class>
+        <body-content>JSP</body-content>
         <description>
             <![CDATA[
             <p><strong>Render an HTML anchor or hyperlink</strong></p>
@@ -5525,6 +5527,47 @@
         </attribute>
     </tag>
     <tag>
+        <name>param</name>
+        <tag-class>org.apache.strutsel.taglib.html.ELParamTag</tag-class>
+                <description>
+            <![CDATA[
+                <p>Adds a parameter to the following tags:
+                    <ol>
+                        <li><a href="#frame">&lt;html:frame&gt;</li>
+                        <li><a href="#link">&lt;html:link&gt;</li>
+                        <li><a href="#rewrite">&lt;html:rewrite&gt;</li>
+                    </ol>
+                </p>
+            
+                    <dl><dt><b>Since:</b></dt>
+                    <dd>Struts 1.3.6</dd></dl>
+                ]]>
+                </description>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                <![CDATA[
+                  <p>The String containing the name of the request 
parameter.</p>
+                ]]>
+            </description>
+        </attribute>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                <![CDATA[
+                  <p>The value of the request parameter specified by the
+                  <code>name</code> attribute, whose return value must
+                  be a String or String[] that will be dynamically added to
+                  this hyperlink.</p>
+                ]]>
+            </description>
+        </attribute>
+    </tag>
+    <tag>
         <name>password</name>
         <tag-class>org.apache.strutsel.taglib.html.ELPasswordTag</tag-class>
         <description>
@@ -6697,7 +6740,7 @@
     <tag>
         <name>rewrite</name>
         <tag-class>org.apache.strutsel.taglib.html.ELRewriteTag</tag-class>
-        <body-content>empty</body-content>
+        <body-content>JSP</body-content>
         <description>
             <![CDATA[
             <p><strong>Render an URI</strong></p>

Modified: 
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-nested.tld
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-nested.tld?view=diff&rev=482910&r1=482909&r2=482910
==============================================================================
--- 
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-nested.tld 
(original)
+++ 
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-nested.tld 
Tue Dec  5 21:43:57 2006
@@ -1896,6 +1896,7 @@
         <name>link</name>
         <tag-class>
             org.apache.struts.taglib.nested.html.NestedLinkTag</tag-class>
+        <body-content>JSP</body-content>
         <description>
             <![CDATA[
             <p><strong>Nested Extension - Render an HTML anchor or 
hyperlink</strong></p>