From f8718f9187028c20bf1c042a6a7bfaaadd4ec8b8 Mon Sep 17 00:00:00 2001
From: Aleksandr Mashchenko <amashchenko@apache.org>
Date: Mon, 2 Nov 2015 22:14:59 +0200
Subject: [PATCH] WW-2069 Drops "id" and "name" attributes" on the tags where
 they are deprecated.

---
 .../struts2/components/AppendIterator.java     |  2 +-
 .../apache/struts2/components/ContextBean.java | 11 -----------
 .../struts2/components/MergeIterator.java      |  2 +-
 .../org/apache/struts2/components/Set.java     | 12 ++----------
 .../struts2/views/jsp/ContextBeanTag.java      |  8 --------
 .../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 --------
 .../struts2/views/jsp/ActionTagTest.java       |  6 +++---
 .../views/jsp/AppendIteratorTagTest.java       |  4 ++--
 .../views/jsp/IteratorGeneratorTagTest.java    |  2 +-
 .../struts2/views/jsp/IteratorTagTest.java     |  4 ++--
 .../views/jsp/MergeIteratorTagTest.java        |  4 ++--
 .../struts2/views/jsp/SortIteratorTagTest.java |  4 ++--
 .../views/jsp/SubsetIteratorTagTest.java       |  4 ++--
 .../apache/struts2/views/jsp/TextTagTest.java  |  2 +-
 .../apache/struts2/views/jsp/URLTagTest.java   |  2 +-
 .../struts2/views/jsp/ui/DateTagTest.java      |  2 +-
 31 files changed, 23 insertions(+), 177 deletions(-)

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 eebddad0f..c639b08aa 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 -->
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 fb3f46308..86f09bfa6 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;
     }
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 52f40ef85..faeb62c3d 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 -->
  *
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 629563cee..1b3c16852 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) {
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 e51fb1996..42ec9f683 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);
-    }
 }
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 07894179f..f6702113c 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;
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 7e6f8534a..091fb15ad 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;
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 daa062f58..6c2ff1e21 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;
diff --git a/core/src/site/resources/tags/action.html b/core/src/site/resources/tags/action.html
index bfeddbf98..dc06e28ec 100644
--- a/core/src/site/resources/tags/action.html
+++ b/core/src/site/resources/tags/action.html
@@ -49,14 +49,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Boolean</td>
 					<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>
diff --git a/core/src/site/resources/tags/append.html b/core/src/site/resources/tags/append.html
index 4904d1036..fe97e5e08 100644
--- a/core/src/site/resources/tags/append.html
+++ b/core/src/site/resources/tags/append.html
@@ -33,14 +33,6 @@ Please do not edit it directly.
 				<th align="left" valign="top"><h4>Type</h4></th>
 				<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>
diff --git a/core/src/site/resources/tags/bean.html b/core/src/site/resources/tags/bean.html
index abbbfff26..74d440843 100644
--- a/core/src/site/resources/tags/bean.html
+++ b/core/src/site/resources/tags/bean.html
@@ -33,14 +33,6 @@ Please do not edit it directly.
 				<th align="left" valign="top"><h4>Type</h4></th>
 				<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>
diff --git a/core/src/site/resources/tags/date.html b/core/src/site/resources/tags/date.html
index 898be381c..536783de3 100644
--- a/core/src/site/resources/tags/date.html
+++ b/core/src/site/resources/tags/date.html
@@ -41,14 +41,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">String</td>
 					<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>
diff --git a/core/src/site/resources/tags/generator.html b/core/src/site/resources/tags/generator.html
index 1ad44f730..bf7535ab6 100644
--- a/core/src/site/resources/tags/generator.html
+++ b/core/src/site/resources/tags/generator.html
@@ -49,14 +49,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Integer</td>
 					<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>
diff --git a/core/src/site/resources/tags/iterator.html b/core/src/site/resources/tags/iterator.html
index 74c4f0a98..c5370c37a 100644
--- a/core/src/site/resources/tags/iterator.html
+++ b/core/src/site/resources/tags/iterator.html
@@ -49,14 +49,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Integer</td>
 					<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>
diff --git a/core/src/site/resources/tags/merge.html b/core/src/site/resources/tags/merge.html
index 21571a96e..38ba2dacf 100644
--- a/core/src/site/resources/tags/merge.html
+++ b/core/src/site/resources/tags/merge.html
@@ -33,14 +33,6 @@ Please do not edit it directly.
 				<th align="left" valign="top"><h4>Type</h4></th>
 				<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>
diff --git a/core/src/site/resources/tags/number.html b/core/src/site/resources/tags/number.html
index 96a260902..eabc6faa7 100644
--- a/core/src/site/resources/tags/number.html
+++ b/core/src/site/resources/tags/number.html
@@ -49,14 +49,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Boolean</td>
 					<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>
diff --git a/core/src/site/resources/tags/set.html b/core/src/site/resources/tags/set.html
index 621fb6799..0fa1cfa35 100644
--- a/core/src/site/resources/tags/set.html
+++ b/core/src/site/resources/tags/set.html
@@ -33,22 +33,6 @@ Please do not edit it directly.
 				<th align="left" valign="top"><h4>Type</h4></th>
 				<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>
@@ -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>
diff --git a/core/src/site/resources/tags/sort.html b/core/src/site/resources/tags/sort.html
index 866e09148..9c8b77acc 100644
--- a/core/src/site/resources/tags/sort.html
+++ b/core/src/site/resources/tags/sort.html
@@ -41,14 +41,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">java.util.Comparator</td>
 					<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>
diff --git a/core/src/site/resources/tags/subset.html b/core/src/site/resources/tags/subset.html
index d708c8bec..ec53ee151 100644
--- a/core/src/site/resources/tags/subset.html
+++ b/core/src/site/resources/tags/subset.html
@@ -49,14 +49,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">org.apache.struts2.util.SubsetIteratorFilter.Decider</td>
 					<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>
diff --git a/core/src/site/resources/tags/text.html b/core/src/site/resources/tags/text.html
index cee74ced6..06ee7be7a 100644
--- a/core/src/site/resources/tags/text.html
+++ b/core/src/site/resources/tags/text.html
@@ -33,14 +33,6 @@ Please do not edit it directly.
 				<th align="left" valign="top"><h4>Type</h4></th>
 				<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>
diff --git a/core/src/site/resources/tags/url.html b/core/src/site/resources/tags/url.html
index bbe28da3a..f3fd56631 100644
--- a/core/src/site/resources/tags/url.html
+++ b/core/src/site/resources/tags/url.html
@@ -73,14 +73,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Boolean</td>
 					<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>
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 d31e498c4..42d9a715e 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();
 
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 540db5560..0054e9fe4 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);
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 6b9ae2e1d..575d62a64 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();
 
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 33077f72b..5efb5f9c3 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();
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 f848f2e71..2aec1a9b4 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);
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 1fcbf2200..744de0b30 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");
 
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 634b30d7b..eca234d1c 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");
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 56e86f74c..ce38d1d90 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();
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 e51637b79..368506310 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());
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 06de0febd..27c6a0d6e 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"));