*
- * - name* (String): The name of the new variable that is assigned the value of value
+ * - var* (String): The name of the new variable that is assigned the value of value
*
* - value (Object): The value that is assigned to the variable named name
*
@@ -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 application" +
", session, request, page, or action.", 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;
*
*
*
- * - id (String) - if specified, the sorted iterator will be place with this id under page context
+ * - var (String) - if specified, the sorted iterator will be place with this name under page context
* - source (Object) - the source for the sort to take place (should be iteratable) else JspException will be thrown
* - comparator* (Object) - the comparator used to do sorting (should be a type of Comparator or its decendent) else JspException will be thrown
*
@@ -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.
Boolean |
Whether the writer should be flush upon end of action component tag, default to true |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| ignoreContextParams |
false |
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.
Type |
Description |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| var |
false |
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.
Type |
Description |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| name |
true |
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.
String |
Date or DateTime format pattern |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| name |
true |
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.
Integer |
The max number entries to be in the iterator |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| separator |
true |
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.
Integer |
if specified the iteration will end on that index(inclusive) |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| status |
false |
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.
Type |
Description |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| var |
false |
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.
Boolean |
Whether grouping is used |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| maximumFractionDigits |
false |
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.
Type |
Description |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
-
- | name |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| scope |
false |
@@ -67,7 +51,7 @@ Please do not edit it directly.
| var |
- false |
+ true |
|
false |
String |
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.
java.util.Comparator |
The comparator to use |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| source |
false |
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.
org.apache.struts2.util.SubsetIteratorFilter.Decider |
Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| source |
false |
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.
Type |
Description |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| name |
true |
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.
Boolean |
Specifies whether to force the addition of scheme, host and port or not |
-
- | id |
- false |
- |
- false |
- String |
- Deprecated. Use 'var' instead |
-
| includeContext |
false |
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"));