Repository: struts Updated Branches: refs/heads/master 2b4d37908 -> f8718f918
WW-2069 Drops "id" and "name" attributes" on the tags where they are deprecated. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f8718f91 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f8718f91 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f8718f91 Branch: refs/heads/master Commit: f8718f9187028c20bf1c042a6a7bfaaadd4ec8b8 Parents: 2b4d379 Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Mon Nov 2 22:14:59 2015 +0200 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Mon Nov 2 22:14:59 2015 +0200 ---------------------------------------------------------------------- .../apache/struts2/components/AppendIterator.java | 2 +- .../apache/struts2/components/ContextBean.java | 11 ----------- .../apache/struts2/components/MergeIterator.java | 2 +- .../java/org/apache/struts2/components/Set.java | 12 ++---------- .../apache/struts2/views/jsp/ContextBeanTag.java | 8 -------- .../views/jsp/iterator/IteratorGeneratorTag.java | 5 ----- .../views/jsp/iterator/SortIteratorTag.java | 7 +------ .../views/jsp/iterator/SubsetIteratorTag.java | 5 ----- core/src/site/resources/tags/action.html | 8 -------- core/src/site/resources/tags/append.html | 8 -------- core/src/site/resources/tags/bean.html | 8 -------- core/src/site/resources/tags/date.html | 8 -------- core/src/site/resources/tags/generator.html | 8 -------- core/src/site/resources/tags/iterator.html | 8 -------- core/src/site/resources/tags/merge.html | 8 -------- core/src/site/resources/tags/number.html | 8 -------- core/src/site/resources/tags/set.html | 18 +----------------- core/src/site/resources/tags/sort.html | 8 -------- core/src/site/resources/tags/subset.html | 8 -------- core/src/site/resources/tags/text.html | 8 -------- core/src/site/resources/tags/url.html | 8 -------- .../apache/struts2/views/jsp/ActionTagTest.java | 6 +++--- .../struts2/views/jsp/AppendIteratorTagTest.java | 4 ++-- .../views/jsp/IteratorGeneratorTagTest.java | 2 +- .../apache/struts2/views/jsp/IteratorTagTest.java | 4 ++-- .../struts2/views/jsp/MergeIteratorTagTest.java | 4 ++-- .../struts2/views/jsp/SortIteratorTagTest.java | 4 ++-- .../struts2/views/jsp/SubsetIteratorTagTest.java | 4 ++-- .../org/apache/struts2/views/jsp/TextTagTest.java | 2 +- .../org/apache/struts2/views/jsp/URLTagTest.java | 2 +- .../apache/struts2/views/jsp/ui/DateTagTest.java | 2 +- 31 files changed, 23 insertions(+), 177 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/components/AppendIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/AppendIterator.java b/core/src/main/java/org/apache/struts2/components/AppendIterator.java index eebddad..c639b08 100644 --- a/core/src/main/java/org/apache/struts2/components/AppendIterator.java +++ b/core/src/main/java/org/apache/struts2/components/AppendIterator.java @@ -59,7 +59,7 @@ import java.util.List; * * <!-- START SNIPPET: params --> * <ul> - * <li>id (String) - the id of which if supplied will have the resultant + * <li>var (String) - the name of which if supplied will have the resultant * appended iterator stored under in the stack's context</li> * </ul> * <!-- END SNIPPET: params --> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/components/ContextBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/ContextBean.java b/core/src/main/java/org/apache/struts2/components/ContextBean.java index fb3f463..86f09bf 100644 --- a/core/src/main/java/org/apache/struts2/components/ContextBean.java +++ b/core/src/main/java/org/apache/struts2/components/ContextBean.java @@ -48,17 +48,6 @@ public abstract class ContextBean extends Component { } } - /** - * To keep backward compatibility - * TODO remove after 2.1 - * - * @param id the given id - */ - @StrutsTagAttribute(description="Deprecated. Use 'var' instead") - public void setId(String id) { - setVar(id); - } - protected String getVar() { return this.var; } http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/components/MergeIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/MergeIterator.java b/core/src/main/java/org/apache/struts2/components/MergeIterator.java index 52f40ef..faeb62c 100644 --- a/core/src/main/java/org/apache/struts2/components/MergeIterator.java +++ b/core/src/main/java/org/apache/struts2/components/MergeIterator.java @@ -61,7 +61,7 @@ import java.util.List; * * <!-- START SNIPPET: params --> * <ul> - * <li>id (String) - the id where the resultant merged iterator will be stored in the stack's context</li> + * <li>var (String) - the name where the resultant merged iterator will be stored in the stack's context</li> * </ul> * <!-- END SNIPPET: params --> * http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/components/Set.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index 629563c..1b3c168 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -58,7 +58,7 @@ import com.opensymphony.xwork2.util.ValueStack; * * <ul> * - * <li>name* (String): The name of the new variable that is assigned the value of <i>value</i></li> + * <li>var* (String): The name of the new variable that is assigned the value of <i>value</i></li> * * <li>value (Object): The value that is assigned to the variable named <i>name</i></li> * @@ -123,19 +123,11 @@ public class Set extends ContextBean { return super.end(writer, body); } - /* - * TODO: set required=true when 'id' is dropped after 2.1 - */ - @StrutsTagAttribute(description="Name used to reference the value pushed into the Value Stack") + @StrutsTagAttribute(required=true, description="Name used to reference the value pushed into the Value Stack") public void setVar(String var) { super.setVar(var); } - @StrutsTagAttribute(description="Deprecated. Use 'var' instead") - public void setName(String name) { - setVar(name); - } - @StrutsTagAttribute(description="The scope in which to assign the variable. Can be <b>application</b>" + ", <b>session</b>, <b>request</b>, <b>page</b>, or <b>action</b>.", defaultValue="action") public void setScope(String scope) { http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java index e51fb19..42ec9f6 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java @@ -37,12 +37,4 @@ public abstract class ContextBeanTag extends ComponentTagSupport { public void setVar(String var) { this.var = var; } - - /** - * To keep backward compatibility - * TODO remove after 2.1 - */ - public void setId(String id) { - setVar(id); - } } http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java index 0789417..f670211 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java @@ -175,11 +175,6 @@ public class IteratorGeneratorTag extends StrutsBodyTagSupport { converterAttr = aConverter; } - @StrutsTagAttribute(description="Deprecated. Use 'var' instead") - public void setId(String string) { - setVar(string); - } - @StrutsTagAttribute(description="The name to store the resultant iterator into page context, if such name is supplied") public void setVar(String var) { this.var = var; http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java index 7e6f853..091fb15 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java @@ -48,7 +48,7 @@ import org.apache.struts2.views.jsp.StrutsBodyTagSupport; * <!-- START SNIPPET: params --> * * <ul> - * <li>id (String) - if specified, the sorted iterator will be place with this id under page context</li> + * <li>var (String) - if specified, the sorted iterator will be place with this name under page context</li> * <li>source (Object) - the source for the sort to take place (should be iteratable) else JspException will be thrown</li> * <li>comparator* (Object) - the comparator used to do sorting (should be a type of Comparator or its decendent) else JspException will be thrown</li> * </ul> @@ -109,11 +109,6 @@ public class SortIteratorTag extends StrutsBodyTagSupport { sourceAttr = source; } - @StrutsTagAttribute(description="Deprecated. Use 'var' instead") - public void setId(String string) { - setVar(string); - } - @StrutsTagAttribute(description="The name to store the resultant iterator into page context, if such name is supplied") public void setVar(String var) { this.var = var; http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java index daa062f..6c2ff1e 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java @@ -192,11 +192,6 @@ public class SubsetIteratorTag extends StrutsBodyTagSupport { deciderAttr = decider; } - @StrutsTagAttribute(description="Deprecated. Use 'var' instead") - public void setId(String string) { - setVar(string); - } - @StrutsTagAttribute(description="The name to store the resultant iterator into page context, if such name is supplied") public void setVar(String var) { this.var = var; http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/action.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/action.html b/core/src/site/resources/tags/action.html index bfeddbf..dc06e28 100644 --- a/core/src/site/resources/tags/action.html +++ b/core/src/site/resources/tags/action.html @@ -50,14 +50,6 @@ Please do not edit it directly. <td align="left" valign="top">Whether the writer should be flush upon end of action component tag, default to true</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">ignoreContextParams</td> <td align="left" valign="top">false</td> <td align="left" valign="top">false</td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/append.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/append.html b/core/src/site/resources/tags/append.html index 4904d10..fe97e5e 100644 --- a/core/src/site/resources/tags/append.html +++ b/core/src/site/resources/tags/append.html @@ -34,14 +34,6 @@ Please do not edit it directly. <th align="left" valign="top"><h4>Description</h4></th> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">var</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/bean.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/bean.html b/core/src/site/resources/tags/bean.html index abbbfff..74d4408 100644 --- a/core/src/site/resources/tags/bean.html +++ b/core/src/site/resources/tags/bean.html @@ -34,14 +34,6 @@ Please do not edit it directly. <th align="left" valign="top"><h4>Description</h4></th> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">name</td> <td align="left" valign="top"><strong>true</strong></td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/date.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/date.html b/core/src/site/resources/tags/date.html index 898be38..536783d 100644 --- a/core/src/site/resources/tags/date.html +++ b/core/src/site/resources/tags/date.html @@ -42,14 +42,6 @@ Please do not edit it directly. <td align="left" valign="top">Date or DateTime format pattern</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">name</td> <td align="left" valign="top"><strong>true</strong></td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/generator.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/generator.html b/core/src/site/resources/tags/generator.html index 1ad44f7..bf7535a 100644 --- a/core/src/site/resources/tags/generator.html +++ b/core/src/site/resources/tags/generator.html @@ -50,14 +50,6 @@ Please do not edit it directly. <td align="left" valign="top">The max number entries to be in the iterator</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">separator</td> <td align="left" valign="top"><strong>true</strong></td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/iterator.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/iterator.html b/core/src/site/resources/tags/iterator.html index 74c4f0a..c5370c3 100644 --- a/core/src/site/resources/tags/iterator.html +++ b/core/src/site/resources/tags/iterator.html @@ -50,14 +50,6 @@ Please do not edit it directly. <td align="left" valign="top">if specified the iteration will end on that index(inclusive)</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">status</td> <td align="left" valign="top">false</td> <td align="left" valign="top">false</td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/merge.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/merge.html b/core/src/site/resources/tags/merge.html index 21571a9..38ba2da 100644 --- a/core/src/site/resources/tags/merge.html +++ b/core/src/site/resources/tags/merge.html @@ -34,14 +34,6 @@ Please do not edit it directly. <th align="left" valign="top"><h4>Description</h4></th> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">var</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/number.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/number.html b/core/src/site/resources/tags/number.html index 96a2609..eabc6fa 100644 --- a/core/src/site/resources/tags/number.html +++ b/core/src/site/resources/tags/number.html @@ -50,14 +50,6 @@ Please do not edit it directly. <td align="left" valign="top">Whether grouping is used</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">maximumFractionDigits</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/set.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/set.html b/core/src/site/resources/tags/set.html index 621fb67..0fa1cfa 100644 --- a/core/src/site/resources/tags/set.html +++ b/core/src/site/resources/tags/set.html @@ -34,22 +34,6 @@ Please do not edit it directly. <th align="left" valign="top"><h4>Description</h4></th> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> - <td align="left" valign="top">name</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">scope</td> <td align="left" valign="top">false</td> <td align="left" valign="top">action</td> @@ -67,7 +51,7 @@ Please do not edit it directly. </tr> <tr> <td align="left" valign="top">var</td> - <td align="left" valign="top">false</td> + <td align="left" valign="top"><strong>true</strong></td> <td align="left" valign="top"></td> <td align="left" valign="top">false</td> <td align="left" valign="top">String</td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/sort.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/sort.html b/core/src/site/resources/tags/sort.html index 866e091..9c8b77a 100644 --- a/core/src/site/resources/tags/sort.html +++ b/core/src/site/resources/tags/sort.html @@ -42,14 +42,6 @@ Please do not edit it directly. <td align="left" valign="top">The comparator to use</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">source</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/subset.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/subset.html b/core/src/site/resources/tags/subset.html index d708c8b..ec53ee1 100644 --- a/core/src/site/resources/tags/subset.html +++ b/core/src/site/resources/tags/subset.html @@ -50,14 +50,6 @@ Please do not edit it directly. <td align="left" valign="top">Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">source</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/text.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/text.html b/core/src/site/resources/tags/text.html index cee74ce..06ee7be 100644 --- a/core/src/site/resources/tags/text.html +++ b/core/src/site/resources/tags/text.html @@ -34,14 +34,6 @@ Please do not edit it directly. <th align="left" valign="top"><h4>Description</h4></th> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">name</td> <td align="left" valign="top"><strong>true</strong></td> <td align="left" valign="top"></td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/site/resources/tags/url.html ---------------------------------------------------------------------- diff --git a/core/src/site/resources/tags/url.html b/core/src/site/resources/tags/url.html index bbe28da..f3fd566 100644 --- a/core/src/site/resources/tags/url.html +++ b/core/src/site/resources/tags/url.html @@ -74,14 +74,6 @@ Please do not edit it directly. <td align="left" valign="top">Specifies whether to force the addition of scheme, host and port or not</td> </tr> <tr> - <td align="left" valign="top">id</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'var' instead</td> - </tr> - <tr> <td align="left" valign="top">includeContext</td> <td align="left" valign="top">false</td> <td align="left" valign="top">true</td> http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java index d31e498..42d9a71 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java @@ -52,7 +52,7 @@ public class ActionTagTest extends AbstractTagTest { ActionTag tag = new ActionTag(); tag.setPageContext(pageContext); tag.setName(TestConfigurationProvider.TEST_NAMESPACE_ACTION); - tag.setId(TestConfigurationProvider.TEST_NAMESPACE_ACTION); + tag.setVar(TestConfigurationProvider.TEST_NAMESPACE_ACTION); try { tag.doStartTag(); @@ -79,7 +79,7 @@ public class ActionTagTest extends AbstractTagTest { ActionTag tag = new ActionTag(); tag.setPageContext(pageContext); tag.setName("testAction"); - tag.setId("testAction"); + tag.setVar("testAction"); int stackSize = stack.size(); @@ -117,7 +117,7 @@ public class ActionTagTest extends AbstractTagTest { ActionTag tag = new ActionTag(); tag.setPageContext(pageContext); tag.setName("testAction"); - tag.setId("testAction"); + tag.setVar("testAction"); int stackSize = stack.size(); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java index 540db55..0054e9f 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java @@ -39,7 +39,7 @@ public class AppendIteratorTagTest extends AbstractTagTest { public void testAppendingIteratorUsingArrayAsSource() throws Exception { AppendIteratorTag tag = new AppendIteratorTag(); tag.setPageContext(pageContext); - tag.setId("myAppendedIterator"); + tag.setVar("myAppendedIterator"); ParamTag iterator1ParamTag = new ParamTag(); iterator1ParamTag.setPageContext(pageContext); @@ -90,7 +90,7 @@ public class AppendIteratorTagTest extends AbstractTagTest { public void testAppendingIteratorsUsingListAsSource() throws Exception { AppendIteratorTag tag = new AppendIteratorTag(); tag.setPageContext(pageContext); - tag.setId("myAppendedIterator"); + tag.setVar("myAppendedIterator"); ParamTag iterator1ParamTag = new ParamTag(); iterator1ParamTag.setPageContext(pageContext); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java index 6b9ae2e..575d62a 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java @@ -138,7 +138,7 @@ public class IteratorGeneratorTagTest extends AbstractTagTest { IteratorGeneratorTag tag = new IteratorGeneratorTag(); tag.setPageContext(pageContext); tag.setVal("%{'aaa,bbb,ccc,ddd,eee'}"); - tag.setId("myPageContextAttId"); + tag.setVar("myPageContextAttId"); tag.doStartTag(); tag.doEndTag(); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java index 33077f7..5efb5f9 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java @@ -58,7 +58,7 @@ public class IteratorTagTest extends AbstractUITagTest { stack.push(foo); tag.setValue("list"); - tag.setId("myId"); + tag.setVar("myId"); // one int result = tag.doStartTag(); @@ -116,7 +116,7 @@ public class IteratorTagTest extends AbstractUITagTest { stack.push(foo); tag.setValue("list"); - tag.setId("myId"); + tag.setVar("myId"); // one int result = tag.doStartTag(); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java index f848f2e..2aec1a9 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java @@ -39,7 +39,7 @@ public class MergeIteratorTagTest extends AbstractTagTest { public void testMergingIteratorWithArrayAsSource() throws Exception { MergeIteratorTag tag = new MergeIteratorTag(); tag.setPageContext(pageContext); - tag.setId("myMergedIterator"); + tag.setVar("myMergedIterator"); ParamTag iterator1ParamTag = new ParamTag(); iterator1ParamTag.setPageContext(pageContext); @@ -91,7 +91,7 @@ public class MergeIteratorTagTest extends AbstractTagTest { public void testMergingIteratorsWithListAsSource() throws Exception { MergeIteratorTag tag = new MergeIteratorTag(); tag.setPageContext(pageContext); - tag.setId("myMergedIterator"); + tag.setVar("myMergedIterator"); ParamTag iterator1ParamTag = new ParamTag(); iterator1ParamTag.setPageContext(pageContext); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java index 1fcbf22..744de0b 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java @@ -76,7 +76,7 @@ public class SortIteratorTagTest extends AbstractTagTest { SortIteratorTag tag = new SortIteratorTag(); - tag.setId("myId"); + tag.setVar("myId"); tag.setComparator("comparator"); tag.setSource("source"); @@ -113,7 +113,7 @@ public class SortIteratorTagTest extends AbstractTagTest { public void testSortWithIdIteratorAvailableInPageContext() throws Exception { SortIteratorTag tag = new SortIteratorTag(); - tag.setId("myId"); + tag.setVar("myId"); tag.setComparator("comparator"); tag.setSource("source"); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java index 634b30d..eca234d 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java @@ -172,7 +172,7 @@ public class SubsetIteratorTagTest extends AbstractTagTest { SubsetIteratorTag tag = new SubsetIteratorTag(); tag.setPageContext(pageContext); tag.setSource("myList"); - tag.setId("myPageContextId1"); + tag.setVar("myPageContextId1"); tag.doStartTag(); Iterator subsetIterator1 = (Iterator) stack.findValue("top"); @@ -194,7 +194,7 @@ public class SubsetIteratorTagTest extends AbstractTagTest { SubsetIteratorTag tag = new SubsetIteratorTag(); tag.setPageContext(pageContext); tag.setSource("myArray"); - tag.setId("myPageContextId2"); + tag.setVar("myPageContextId2"); tag.doStartTag(); Iterator subsetIterator1 = (Iterator) stack.findValue("top"); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java index 56e86f7..ce38d1d 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java @@ -298,7 +298,7 @@ public class TextTagTest extends AbstractTagTest { public void testPutId() throws Exception { assertEquals(null, stack.findString("myId")); // nothing in stack - tag.setId("myId"); + tag.setVar("myId"); tag.setName("bar.baz"); tag.doStartTag(); tag.doEndTag(); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java index e51637b..3685063 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java @@ -353,7 +353,7 @@ public class URLTagTest extends AbstractUITagTest { public void testPutId() throws Exception { tag.setValue("/public/about"); assertEquals(null, stack.findString("myId")); // nothing in stack - tag.setId("myId"); + tag.setVar("myId"); tag.doStartTag(); tag.doEndTag(); assertEquals("", writer.toString()); http://git-wip-us.apache.org/repos/asf/struts/blob/f8718f91/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java index 06de0fe..27c6a0d 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java @@ -147,7 +147,7 @@ public class DateTagTest extends AbstractTagTest { tag.setName("myDate"); tag.setNice(false); tag.setFormat(format); - tag.setId("myId"); + tag.setVar("myId"); tag.doStartTag(); tag.doEndTag(); assertEquals(formatted, context.get("myId"));
