Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 09:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing tag output to be more xhtml compliant, adding mapper extension test

Browse Source 
WW-1649


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@541983 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2007-05-27 13:10:27 +00:00
parent 65f13cd7b4
commit 919e1ffe07
32 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/archive/simple/checkboxlist.vm
+1 -1
View File
@@ -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
core/src/main/resources/template/archive/simple/combobox.vm
+1 -1
View File
@@ -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"
core/src/main/resources/template/archive/simple/debug.vm
+3 -3
View File
@@ -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>
core/src/main/resources/template/archive/simple/doubleselect.vm
+1 -1
View File
@@ -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
core/src/main/resources/template/archive/simple/table.vm
+4 -4
View File
@@ -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>
core/src/main/resources/template/css_xhtml/controlheader-core.ftl
+1 -1
View File
@@ -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>
core/src/main/resources/template/css_xhtml/head.ftl
+1 -1
View File
@@ -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" />
core/src/main/resources/template/simple/checkbox.ftl
+1 -1
View File
@@ -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}"/>
<input type="hidden" name="__checkbox_${parameters.name?html}" value="${parameters.fieldValue?html}" />
core/src/main/resources/template/simple/combobox.ftl
+1 -1
View File
@@ -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)>
core/src/main/resources/template/simple/debug.ftl
+3 -3
View File
@@ -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>
core/src/main/resources/template/simple/doubleselect.ftl
+1 -1
View File
@@ -7,7 +7,7 @@
<#assign startCount = startCount + 1/>
</#if>
<br/>
<br />
<select<#rt/>
name="${parameters.doubleName?default("")?html}"<#rt/>
<#if parameters.disabled?default(false)>
core/src/main/resources/template/simple/form.ftl
+1 -1
View File
@@ -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/>
core/src/main/resources/template/simple/inputtransferselect.ftl
+5 -5
View File
@@ -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)>
core/src/main/resources/template/simple/optiontransferselect.ftl
+14 -14
View File
@@ -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}"
core/src/main/resources/template/simple/table.ftl
+1 -1
View File
@@ -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>
core/src/main/resources/template/simple/token.ftl
+2 -2
View File
@@ -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}" />
core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+16
View File
@@ -211,6 +211,22 @@ public class DefaultActionMapperTest extends StrutsTestCase {
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 ===
core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
+12 -12
View File
@@ -55,7 +55,7 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
/**
* Testing that this: <p>
* &lt;a:form name=&quot;'myForm'&quot; namespace=&quot;'/testNamespace'&quot; action=&quot;'testNamespaceAction'&quot; method=&quot;'POST'&quot;&gt;
* &lt;a:form name=&quot;'myForm'&quot; namespace=&quot;'/testNamespace'&quot; action=&quot;'testNamespaceAction'&quot; method=&quot;'post'&quot;&gt;
* <p/>
* doesn't create an action of &quot;/testNamespace/testNamespaceAction.action&quot; when the &quot;struts.action.extension&quot;
* config property is set to &quot;jspa&quot;.
@@ -366,7 +366,7 @@ public class FormTagTest extends AbstractUITagTest {
tag.setPageContext(pageContext);
tag.setNamespace("/testNamespace");
tag.setAction("testNamespaceAction");
tag.setMethod("POST");
tag.setMethod("post");
tag.setName("myForm");
tag.doStartTag();
@@ -377,7 +377,7 @@ public class FormTagTest extends AbstractUITagTest {
/**
* Testing that this: <p>
* &lt;a:form name=&quot;'myForm'&quot; action=&quot;'/testNamespace/testNamespaceAction.jspa'&quot; method=&quot;'POST'&quot;&gt;
* &lt;a:form name=&quot;'myForm'&quot; action=&quot;'/testNamespace/testNamespaceAction.jspa'&quot; method=&quot;'post'&quot;&gt;
* <p/>
* doesn't create an action of &quot;/testNamespace/testNamespaceAction.action&quot;
*/
@@ -387,7 +387,7 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
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 @@ public class FormTagTest extends AbstractUITagTest {
FormTag tag = new FormTag();
tag.setPageContext(pageContext);
tag.setAction("/testNamespace/testNamespaceAction.jspa");
tag.setMethod("POST");
tag.setMethod("post");
tag.setName("myForm");
tag.doStartTag();
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+1 -1
View File
@@ -1,6 +1,6 @@
<script type="text/javascript" src="/struts/xhtml/validation.js"></script>
<script type="text/javascript" src="/struts/utils.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 language="javascript" src="/struts/optiontransferselect.js"></script>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+1 -1
View File
@@ -1,6 +1,6 @@
<script type="text/javascript" src="/struts/xhtml/validation.js"></script>
<script type="text/javascript "src="/struts/utils.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 language="javascript" src="/struts/optiontransferselect.js"></script>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
+1 -1
View File
@@ -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 language="javascript" src="/struts/optiontransferselect.js"></script>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt
+1 -1
View File
@@ -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">
<tableclass="wwFormTable">
<tr>
<td class="tdLabel">
core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt
+1 -1
View File
@@ -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">
<tableclass="wwFormTable">
<tr>
<td class="tdLabel">
core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt
+1 -1
View File
@@ -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">
<tableclass="wwFormTable">
<tr>
<td class="tdLabel">