You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/05/27 15:04:04 UTC
svn commit: r541982 - in /struts/struts2/branches/STRUTS_2_0_X/core/src:
main/resources/template/archive/simple/ main/resources/template/css_xhtml/
main/resources/template/simple/
test/java/org/apache/struts2/dispatcher/mapper/ test/java/org/apache/str...
Author: mrdon
Date: Sun May 27 06:04:02 2007
New Revision: 541982
URL: http://svn.apache.org/viewvc?view=rev&rev=541982
Log:
Fixing tag output to be more xhtml compliant, adding mapper extension test
WW-1649
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/checkboxlist.vm
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/combobox.vm
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/debug.vm
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/doubleselect.vm
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/table.vm
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/head.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkbox.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/combobox.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/debug.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/form.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/inputtransferselect.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/table.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/token.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/checkboxlist.vm
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/checkboxlist.vm?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/checkboxlist.vm (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/checkboxlist.vm Sun May 27 06:04:02 2007
@@ -16,7 +16,7 @@
#end
<input type="checkbox" name="$!struts.htmlEncode($parameters.name)" value="$!struts.htmlEncode($itemKey)"
#parse("/$parameters.templateDir/simple/scripting-events.vm")
- id="$!struts.htmlEncode($parameters.name)-$itemCount" #if( $tag.contains($parameters.nameValue, $itemKey) ) checked="checked" #end/>
+ id="$!struts.htmlEncode($parameters.name)-$itemCount" #if( $tag.contains($parameters.nameValue, $itemKey) ) checked="checked" #end />
<label for="$!struts.htmlEncode($parameters.name)-$itemCount" class="checkboxLabel">$!struts.htmlEncode($itemValue)</label><br />
#set ($trash = $stack.pop())
#end
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/combobox.vm
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/combobox.vm?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/combobox.vm (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/combobox.vm Sun May 27 06:04:02 2007
@@ -11,7 +11,7 @@
#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" #end
#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" #end
#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/><br/>
+/><br />
#if ($parameters.list)
<select onChange="this.form.elements['$!struts.htmlEncode($parameters.name)'].value=this.options[this.selectedIndex].value"
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/debug.vm
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/debug.vm?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/debug.vm (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/debug.vm Sun May 27 06:04:02 2007
@@ -13,14 +13,14 @@
}
-->
</script>
-<p/>
+<p />
#set ($id = $parameters.id)
#if ($id) #else #set ($id = 'debug') #end
<a href="#" onclick="toggleDebug('$id');return false;">[Debug]</a>
<div style="display:none" id="$id">
<h2>Struts ValueStack Debug</h2>
-<p/>
+<p />
#set($contextMap = $stack.context)
@@ -60,6 +60,6 @@
#set ($index = $index + 1)
#end
</table>
-<p/>
+<p />
</div>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/doubleselect.vm
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/doubleselect.vm?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/doubleselect.vm (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/doubleselect.vm Sun May 27 06:04:02 2007
@@ -7,7 +7,7 @@
#set ( $startCount = $startCount + 1)
#end
-<br/>
+<br />
<select name="$!struts.htmlEncode($parameters.doubleName)"
#if ($parameters.disabled) disabled="disabled" #end
#if ($parameters.doubleTabindex) tabindex="$!struts.htmlEncode($parameters.doubleTabindex)" #end
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/table.vm
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/table.vm?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/table.vm (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/archive/simple/table.vm Sun May 27 06:04:02 2007
@@ -31,12 +31,12 @@
<td align="bottom">
#if(($webTable.sortColumn == $curColumn.offset) && ($webTable.sortOrder == 'ASC'))
- <img src="#tag( URL "value='/images/sorted_asc.gif'")" border="0" align="bottom"/> #else
+ <img src="#tag( URL "value='/images/sorted_asc.gif'")" border="0" align="bottom" /> #else
<a href="#bodytag( URL )
#param( $webTable.sortColumnLinkName $curColumn.offset)
#param( $webTable.sortOrderLinkName 'ASC')
#end">
- <img src="#tag( URL "value='/images/unsorted_asc.gif'")" border="0" align="bottom"/></a>
+ <img src="#tag( URL "value='/images/unsorted_asc.gif'")" border="0" align="bottom" /></a>
#end
</td>
</tr>
@@ -44,12 +44,12 @@
<td align="top">
#if(($webTable.sortColumn == $curColumn.offset) && ($webTable.sortOrder == 'DESC'))
- <img src="#tag( URL "value='/images/sorted_desc.gif'")" border="0" align="top"/>
+ <img src="#tag( URL "value='/images/sorted_desc.gif'")" border="0" align="top" />
#else
<a href="#bodytag( URL )
#param( $webTable.sortColumnLinkName $curColumn.offset)
#param( $webTable.sortOrderLinkName 'DESC')
- #end"><img src="#tag( URL "value='/images/unsorted_desc.gif'")" border="0" align="top"/></a>
+ #end"><img src="#tag( URL "value='/images/unsorted_desc.gif'")" border="0" align="top" /></a>
#end
</td>
</tr>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/controlheader-core.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/controlheader-core.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/controlheader-core.ftl Sun May 27 06:04:02 2007
@@ -43,7 +43,7 @@
<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
</label><#t/>
<#if parameters.labelposition?default("top") == 'top'>
-</div> <br/><#rt/>
+</div> <br /><#rt/>
<#else>
</span> <#rt/>
</#if>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/head.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/head.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/head.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/head.ftl Sun May 27 06:04:02 2007
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@s.url value='/struts/css_xhtml/styles.css' includeParams='none' encode='false' />" type="text/css" />
<#include "/${parameters.templateDir}/simple/head.ftl" />
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkbox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkbox.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkbox.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/checkbox.ftl Sun May 27 06:04:02 2007
@@ -26,4 +26,4 @@
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
-<input type="hidden" name="__checkbox_${parameters.name?html}" value="${parameters.fieldValue?html}"/>
\ No newline at end of file
+<input type="hidden" name="__checkbox_${parameters.name?html}" value="${parameters.fieldValue?html}" />
\ No newline at end of file
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/combobox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/combobox.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/combobox.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/combobox.ftl Sun May 27 06:04:02 2007
@@ -14,7 +14,7 @@
}
</script>
<#include "/${parameters.templateDir}/simple/text.ftl" />
-<br/>
+<br />
<#if parameters.list?exists>
<select onChange="autoPopulate_${parameters.id?html}(this);"<#rt/>
<#if parameters.disabled?default(false)>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/debug.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/debug.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/debug.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/debug.ftl Sun May 27 06:04:02 2007
@@ -13,12 +13,12 @@
}
-->
</script>
-<p/>
+<p />
<a href="#" onclick="toggleDebug('<#if parameters.id?if_exists != "">${parameters.id?html}<#else>debug</#if>');return false;">[Debug]</a>
<div style="display:none" id="<#if parameters.id?if_exists != "">${parameters.id?html}<#else>debug</#if>">
<h2>Struts ValueStack Debug</h2>
-<p/>
+<p />
<h3>Value Stack Contents</h3>
<table border="0" cellpadding="2" cellspacing="0" width="400" bgcolor="#DDDDDD">
@@ -39,7 +39,7 @@
</#list>
</#list>
</table>
-<p/>
+<p />
<h3>Stack Context</h3>
<i>These items are available using the #key notation</i>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl Sun May 27 06:04:02 2007
@@ -7,7 +7,7 @@
<#assign startCount = startCount + 1/>
</#if>
-<br/>
+<br />
<select<#rt/>
name="${parameters.doubleName?default("")?html}"<#rt/>
<#if parameters.disabled?default(false)>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/form.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/form.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/form.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/form.ftl Sun May 27 06:04:02 2007
@@ -27,7 +27,7 @@
<#if parameters.method?exists>
method="${parameters.method?html}"<#rt/>
<#else>
- method="POST"<#rt/>
+ method="post"<#rt/>
</#if>
<#if parameters.enctype?exists>
enctype="${parameters.enctype?html}"<#rt/>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/inputtransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/inputtransferselect.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/inputtransferselect.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/inputtransferselect.ftl Sun May 27 06:04:02 2007
@@ -6,7 +6,7 @@
<tr>
<td>
<#if parameters.leftTitle?exists><#t/>
- <label for="leftTitle">${parameters.leftTitle}</label><br/>
+ <label for="leftTitle">${parameters.leftTitle}</label><br />
</#if><#t/>
@@ -48,7 +48,7 @@
<#if parameters.buttonCssStyle?exists>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addLabel}" onclick="addOption(document.getElementById('${parameters.id?html}_input'), document.getElementById('${parameters.id?html}'))" /><br/><br/>
+ value="${addLabel}" onclick="addOption(document.getElementById('${parameters.id?html}_input'), document.getElementById('${parameters.id?html}'))" /><br /><br />
<#t/>
<#assign removeLabel=parameters.removeLabel?default("<-")?html /><#t/>
<input type="button"
@@ -58,7 +58,7 @@
<#if parameters.buttonCssStyle?exists>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${removeLabel}" onclick="removeOptions(document.getElementById('${parameters.id?html}'))" /><br/><br/>
+ value="${removeLabel}" onclick="removeOptions(document.getElementById('${parameters.id?html}'))" /><br /><br />
<#t/>
<#assign removeAllLabel=parameters.removeAllLabel?default("<<--")?html /><#t/>
<input type="button"
@@ -68,11 +68,11 @@
<#if parameters.buttonCssStyle?exists>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${removeAllLabel}" onclick="removeAllOptions(document.getElementById('${parameters.id?html}'))" /><br/><br/>
+ value="${removeAllLabel}" onclick="removeAllOptions(document.getElementById('${parameters.id?html}'))" /><br /><br />
</td>
<td>
<#if parameters.rightTitle?exists><#t/>
- <label for="rightTitle">${parameters.rightTitle}</label><br/>
+ <label for="rightTitle">${parameters.rightTitle}</label><br />
</#if><#t/>
<#include "/${parameters.templateDir}/simple/select.ftl" />
<#if parameters.allowUpDown?default(true)>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl Sun May 27 06:04:02 2007
@@ -6,7 +6,7 @@
<tr>
<td>
<#if parameters.leftTitle?exists><#t/>
- <label for="leftTitle">${parameters.leftTitle}</label><br/>
+ <label for="leftTitle">${parameters.leftTitle}</label><br />
</#if><#t/>
<#include "/${parameters.templateDir}/simple/select.ftl" />
<#if parameters.allowUpDownOnLeft?default(true)>
@@ -44,7 +44,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '')" /><br/><br/>
+ value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '')" /><br /><br />
<#else><#t/>
<input type="button"
<#if parameters.buttonCssClass?exists><#t/>
@@ -53,7 +53,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '')" /><br/><br/>
+ value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '')" /><br /><br />
</#if><#t/>
</#if><#t/>
<#if parameters.allowAddToRight?default(true)><#t/>
@@ -66,7 +66,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '')" /><br/><br/>
+ value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '')" /><br /><br />
<#else><#t/>
<input type="button"
<#if parameters.buttonCssClass?exists><#t/>
@@ -75,7 +75,7 @@
<#if parameters.buttonCssStyle?exists>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '')" /><br/><br/>
+ value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '')" /><br /><br />
</#if><#t/>
</#if><#t/>
<#if parameters.allowAddAllToLeft?default(true)><#t/>
@@ -88,7 +88,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle}"
</#if><#t/>
- value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '')" /><br/><br/>
+ value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '')" /><br /><br />
<#else><#t/>
<input type="button"
<#if parameters.buttonCssClass?exists><#t/>
@@ -97,7 +97,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '')" /><br/><br/>
+ value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '')" /><br /><br />
</#if><#t/>
</#if><#t/>
<#if parameters.allowAddAllToRight?default(true)><#t/>
@@ -110,7 +110,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '')" /><br/><br/>
+ value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '')" /><br /><br />
<#else><#t/>
<input type="button"
<#if parameters.buttonCssClass?exists><#t/>
@@ -119,7 +119,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '')" /><br/><br/>
+ value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '')" /><br /><br />
</#if><#t/>
</#if><#t/>
<#if parameters.allowSelectAll?default(true)><#t/>
@@ -132,7 +132,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');" /><br/><br/>
+ value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');" /><br /><br />
<#elseif parameters.headerKey?exists><#t/>
<input type="button"
<#if parameters.buttonCssClass?exists><#t/>
@@ -141,7 +141,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptions(document.getElementById('${parameters.doubleId?html}'));" /><br/><br/>
+ value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptions(document.getElementById('${parameters.doubleId?html}'));" /><br /><br />
<#elseif parameters.doubleHeaderKey?exists><#t/>
<input type="button"
<#if parameters.buttonCssClass?exists><#t/>
@@ -150,7 +150,7 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');" /><br/><br/>
+ value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');" /><br /><br />
<#else><#t/>
<input type="button"
<#if parameters.buttonCssClass?exists><#t/>
@@ -159,13 +159,13 @@
<#if parameters.buttonCssStyle?exists><#t/>
style="${parameters.buttonCssStyle?html}"
</#if><#t/>
- value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptions(document.getElementById('${parameters.doubleId?html}'));" /><br/><br/>
+ value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptions(document.getElementById('${parameters.doubleId?html}'));" /><br /><br />
</#if><#t/>
</#if><#t/>
</td>
<td>
<#if parameters.rightTitle?exists><#t/>
- <label for="rightTitle">${parameters.rightTitle}</label><br/>
+ <label for="rightTitle">${parameters.rightTitle}</label><br />
</#if><#t/>
<select
name="${parameters.doubleName?default("")?html}"
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/table.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/table.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/table.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/table.ftl Sun May 27 06:04:02 2007
@@ -20,7 +20,7 @@
<tr>
<td align="bottom">
<#if false>
- <img src="images/sorted_asc.gif" border="0" align="bottom"/>
+ <img src="images/sorted_asc.gif" border="0" align="bottom" />
<#else>
<a href="<@s.url><@s.param name="${webTable.sortColumnLinkName}" value="${curColumn.offset}"/><@s.param name="${webTable.sortOrderLinkName}" value="ASC"/></...@s.url>"><img src="images/unsorted_asc.gif" border="0" align="bottom"/></a>
</#if>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/token.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/token.ftl?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/token.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/token.ftl Sun May 27 06:04:02 2007
@@ -1,2 +1,2 @@
-<input type="hidden" name="${parameters.tokenNameField?default("")}" value="${parameters.name?default("")?html}"/>
-<input type="hidden" name="${parameters.name?default("")}" value="${parameters.token?default("")?html}"/>
+<input type="hidden" name="${parameters.tokenNameField?default("")}" value="${parameters.name?default("")?html}" />
+<input type="hidden" name="${parameters.name?default("")}" value="${parameters.token?default("")?html}" />
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java Sun May 27 06:04:02 2007
@@ -211,6 +211,22 @@
assertEquals("actionName", mapping.getName());
assertNull(mapping.getMethod());
}
+
+ public void testGetMappingWithNoExtensionButUriHasExtension() throws Exception {
+ req.setupGetParameterMap(new HashMap());
+ req.setupGetRequestURI("/my/namespace/actionName.html");
+ req.setupGetServletPath("/my/namespace/actionName.html");
+ req.setupGetAttribute(null);
+ req.addExpectedGetAttributeName("javax.servlet.include.servlet_path");
+
+ DefaultActionMapper mapper = new DefaultActionMapper();
+ mapper.setExtensions("");
+ ActionMapping mapping = mapper.getMapping(req, configManager);
+
+ assertEquals("/my/namespace", mapping.getNamespace());
+ assertEquals("actionName.html", mapping.getName());
+ assertNull(mapping.getMethod());
+ }
// =============================
// === test name & namespace ===
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java Sun May 27 06:04:02 2007
@@ -55,7 +55,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setAcceptcharset("UTF-8");
tag.setAction("testAction");
tag.setEnctype("myEncType");
@@ -74,7 +74,7 @@
tag.setPageContext(pageContext);
tag.setName("myForm");
tag.setNamespace("/testNamespace");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setAcceptcharset("UTF-8");
tag.setAction("testNamespaceAction");
tag.setEnctype("myEncType");
@@ -98,7 +98,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setAcceptcharset("UTF-8");
tag.setAction("myAction");
tag.setEnctype("myEncType");
@@ -188,7 +188,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setAction("myAction");
tag.setAcceptcharset("UTF-8");
tag.setEnctype("myEncType");
@@ -293,7 +293,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setAction("myAction");
tag.setAcceptcharset("UTF-8");
tag.setEnctype("myEncType");
@@ -327,7 +327,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setAction("myAction");
tag.setEnctype("myEncType");
tag.setTitle("mytitle");
@@ -350,7 +350,7 @@
/**
* Testing that this: <p>
- * <a:form name="'myForm'" namespace="'/testNamespace'" action="'testNamespaceAction'" method="'POST'">
+ * <a:form name="'myForm'" namespace="'/testNamespace'" action="'testNamespaceAction'" method="'post'">
* <p/>
* doesn't create an action of "/testNamespace/testNamespaceAction.action" when the "struts.action.extension"
* config property is set to "jspa".
@@ -366,7 +366,7 @@
tag.setPageContext(pageContext);
tag.setNamespace("/testNamespace");
tag.setAction("testNamespaceAction");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setName("myForm");
tag.doStartTag();
@@ -377,7 +377,7 @@
/**
* Testing that this: <p>
- * <a:form name="'myForm'" action="'/testNamespace/testNamespaceAction.jspa'" method="'POST'">
+ * <a:form name="'myForm'" action="'/testNamespace/testNamespaceAction.jspa'" method="'post'">
* <p/>
* doesn't create an action of "/testNamespace/testNamespaceAction.action"
*/
@@ -387,7 +387,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setAction("/testNamespace/testNamespaceAction.jspa");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setName("myForm");
tag.doStartTag();
@@ -405,7 +405,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setName("myForm");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setAction("testNamespaceAction");
tag.doStartTag();
@@ -569,7 +569,7 @@
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setAction("/testNamespace/testNamespaceAction.jspa");
- tag.setMethod("POST");
+ tag.setMethod("post");
tag.setName("myForm");
tag.doStartTag();
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="myAction" name="myForm" onsubmit="submitMe(); return true;" action="myAction" method="POST" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form id="myAction" name="myForm" onsubmit="submitMe(); return true;" action="myAction" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="testNamespaceAction" name="myForm" onsubmit="submitMe(); return true;" action="/testNamespace/testNamespaceAction.action" method="POST" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form id="testNamespaceAction" name="myForm" onsubmit="submitMe(); return true;" action="/testNamespace/testNamespaceAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt Sun May 27 06:04:02 2007
@@ -1,5 +1,5 @@
<script type="text/javascript" src="/struts/xhtml/validation.js"></script>
-<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="POST" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
<td> <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt Sun May 27 06:04:02 2007
@@ -1,5 +1,5 @@
<script type="text/javascript" src="/struts/xhtml/validation.js"></script>
-<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="POST" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return validateForm_myAction();" action="/myAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
<td> <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="testNamespaceAction" name="myForm" onsubmit="return true;" action="/testNamespace/testNamespaceAction.action" method="POST">
+<form id="testNamespaceAction" name="myForm" onsubmit="return true;" action="/testNamespace/testNamespaceAction.action" method="post">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="foo" onsubmit="return true;" action="/foo.jsp" method="POST">
+<form id="foo" onsubmit="return true;" action="/foo.jsp" method="post">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="testNamespaceAction" name="myForm"onsubmit="return true;" action="/testNamespace/testNamespaceAction.jspa" method="POST">
+<form id="testNamespaceAction" name="myForm"onsubmit="return true;" action="/testNamespace/testNamespaceAction.jspa" method="post">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return true;" action="myAction" method="POST" enctype="myEncType" title="mytitle">
+<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return true;" action="myAction" method="post" enctype="myEncType" title="mytitle">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
<td> <script type="text/javascript" src="/struts/optiontransferselect.js"></script>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="test" onsubmit="return true;" action="test.html" method="POST">
+<form id="test" onsubmit="return true;" action="test.html" method="post">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="testNamespaceAction" name="myForm"onsubmit="return true;" action="/testNamespace/testNamespaceAction.jspa" method="POST">
+<form id="testNamespaceAction" name="myForm"onsubmit="return true;" action="/testNamespace/testNamespaceAction.jspa" method="post">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="testAction" name="myForm" onsubmit="submitMe(); return true;" action="/testAction.action" method="POST" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
+<form id="testAction" name="myForm" onsubmit="submitMe(); return true;" action="/testAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8">
<table class="wwFormTable">
</table>
</form>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="POST">
+<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="post">
<table class="wwFormTable">
<tr>
<td class="tdLabel"><label for="myId" class="label">MyLabel:
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="POST">
+<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="post">
<table class="wwFormTable">
<tr>
<td class="tdLabel"><label for="myId" class="label">MyLabel:
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt?view=diff&rev=541982&r1=541981&r2=541982
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt Sun May 27 06:04:02 2007
@@ -1,4 +1,4 @@
-<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="POST">
+<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="post">
<table class="wwFormTable">
<tr>
<td class="tdLabel"><label for="myId" class="label">MyLabel: