struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From musa...@apache.org
Subject svn commit: r554226 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ main/java/org/apache/struts2/views/jsp/iterator/ main/java/org/apache/struts2/views/jsp/ui/ site/resources/tags/
Date Sat, 07 Jul 2007 17:04:09 GMT
Author: musachy
Date: Sat Jul  7 10:04:06 2007
New Revision: 554226

URL: http://svn.apache.org/viewvc?view=rev&rev=554226
Log:
WW-2027 Tags that push values into the value stack should use the "var" attribute to specify the name of the variable

Added:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java
Modified:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
    struts/struts2/trunk/core/src/site/resources/tags/a.html
    struts/struts2/trunk/core/src/site/resources/tags/action.html
    struts/struts2/trunk/core/src/site/resources/tags/actionerror.html
    struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html
    struts/struts2/trunk/core/src/site/resources/tags/append.html
    struts/struts2/trunk/core/src/site/resources/tags/bean.html
    struts/struts2/trunk/core/src/site/resources/tags/checkbox.html
    struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
    struts/struts2/trunk/core/src/site/resources/tags/combobox.html
    struts/struts2/trunk/core/src/site/resources/tags/component.html
    struts/struts2/trunk/core/src/site/resources/tags/date.html
    struts/struts2/trunk/core/src/site/resources/tags/debug.html
    struts/struts2/trunk/core/src/site/resources/tags/div.html
    struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
    struts/struts2/trunk/core/src/site/resources/tags/fielderror.html
    struts/struts2/trunk/core/src/site/resources/tags/file.html
    struts/struts2/trunk/core/src/site/resources/tags/form.html
    struts/struts2/trunk/core/src/site/resources/tags/head.html
    struts/struts2/trunk/core/src/site/resources/tags/hidden.html
    struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html
    struts/struts2/trunk/core/src/site/resources/tags/iterator.html
    struts/struts2/trunk/core/src/site/resources/tags/label.html
    struts/struts2/trunk/core/src/site/resources/tags/merge.html
    struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
    struts/struts2/trunk/core/src/site/resources/tags/password.html
    struts/struts2/trunk/core/src/site/resources/tags/radio.html
    struts/struts2/trunk/core/src/site/resources/tags/reset.html
    struts/struts2/trunk/core/src/site/resources/tags/select.html
    struts/struts2/trunk/core/src/site/resources/tags/set.html
    struts/struts2/trunk/core/src/site/resources/tags/submit.html
    struts/struts2/trunk/core/src/site/resources/tags/text.html
    struts/struts2/trunk/core/src/site/resources/tags/textarea.html
    struts/struts2/trunk/core/src/site/resources/tags/textfield.html
    struts/struts2/trunk/core/src/site/resources/tags/token.html
    struts/struts2/trunk/core/src/site/resources/tags/updownselect.html
    struts/struts2/trunk/core/src/site/resources/tags/url.html

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java Sat Jul  7 10:04:06 2007
@@ -114,7 +114,7 @@
  *
  */
 @StrutsTag(name="action", tldTagClass="org.apache.struts2.views.jsp.ActionTag", description="Execute an action from within a view")
-public class ActionComponent extends Component {
+public class ActionComponent extends ContextBean {
     private static final Log LOG = LogFactory.getLog(ActionComponent.class);
 
     protected HttpServletResponse res;
@@ -154,8 +154,8 @@
             }
             executeAction();
 
-            if ((getId() != null) && (proxy != null)) {
-                getStack().setValue("#attr['" + getId() + "']",
+            if ((getVar() != null) && (proxy != null)) {
+                getStack().setValue("#attr['" + getVar() + "']",
                         proxy.getAction());
             }
         } finally {
@@ -262,9 +262,8 @@
             req.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
         }
 
-        if ((getId() != null) && (proxy != null)) {
-            final Map context = stack.getContext();
-            context.put(getId(), proxy.getAction());
+        if ((getVar() != null) && (proxy != null)) {
+            putInContext(proxy.getAction());
         }
     }
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java Sat Jul  7 10:04:06 2007
@@ -116,7 +116,7 @@
  *
  */
 @StrutsTag(name="append", tldTagClass="org.apache.struts2.views.jsp.iterator.AppendIteratorTag", description="Append the values of a list of iterators to one iterator")
-public class AppendIterator extends Component implements UnnamedParametric {
+public class AppendIterator extends ContextBean implements UnnamedParametric {
 
     private static final Log _log = LogFactory.getLog(AppendIterator.class);
 
@@ -148,9 +148,7 @@
 
         appendIteratorFilter.execute();
 
-        if (getId() != null && getId().length() > 0) {
-            getStack().getContext().put(getId(), appendIteratorFilter);
-        }
+        putInContext(appendIteratorFilter);
 
         appendIteratorFilter = null;
 
@@ -162,9 +160,9 @@
         _parameters.add(value);
     }
 
-    @StrutsTagAttribute(description="The id of which if supplied will have the resultant appended iterator stored under in the stack's context")
-    public void setId(String id) {
-        super.setId(id);
+    @StrutsTagAttribute(description="The name of which if supplied will have the resultant appended iterator stored under in the stack's context")
+    public void setVar(String var) {
+        super.setVar(var);
     }
 }
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java Sat Jul  7 10:04:06 2007
@@ -95,7 +95,7 @@
  */
 @StrutsTag(name="bean", tldTagClass="org.apache.struts2.views.jsp.BeanTag",
         description="Instantiate a JavaBean and place it in the context")
-public class Bean extends Component {
+public class Bean extends ContextBean {
     protected static Log log = LogFactory.getLog(Bean.class);
 
     protected Object bean;
@@ -129,9 +129,7 @@
         stack.push(bean);
 
         // store for reference later
-        if (getId() != null) {
-            getStack().getContext().put(getId(), bean);
-        }
+        putInContext(bean);
 
         return result;
     }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java Sat Jul  7 10:04:06 2007
@@ -55,7 +55,6 @@
 
     protected ValueStack stack;
     protected Map parameters;
-    protected String id;
     protected ActionMapper actionMapper;
 
     /**
@@ -225,7 +224,7 @@
      * @return  the constructed <code>StrutsException</code>.
      */
     protected StrutsException fieldError(String field, String errorMsg, Exception e) {
-        String msg = "tag '" + getComponentName() + "', field '" + field + ( id != null ?"', id '" + id:"") +
+        String msg = "tag '" + getComponentName() + "', field '" + field +
                 ( parameters != null && parameters.containsKey("name")?"', name '" + parameters.get("name"):"") +
                 "': " + errorMsg;
         throw new StrutsException(msg, e);
@@ -440,21 +439,6 @@
             } else {
                 params.put(key, value);
             }
-        }
-    }
-
-    /**
-     * Get's the id for referencing element.
-     * @return the id for referencing element.
-     */
-    public String getId() {
-        return id;
-    }
-
-    @StrutsTagAttribute(description="id for referencing element. For UI and form tags it will be used as HTML id attribute")
-    public void setId(String id) {
-        if (id != null) {
-            this.id = findString(id);
         }
     }
 

Added: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java?view=auto&rev=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java (added)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java Sat Jul  7 10:04:06 2007
@@ -0,0 +1,62 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.components;
+
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * Base class for control and data tags
+ */
+public class ContextBean extends Component {
+    protected String var;
+    
+    public ContextBean(ValueStack stack) {
+        super(stack);
+    }
+
+    protected void putInContext(Object value) {
+        if (var != null && var.length() > 0) {
+            stack.getContext().put(var, value);
+        }
+    }
+    
+    @StrutsTagAttribute(description="Name used to reference the value pushed into the Value Stack")
+    public void setVar(String var) {
+        if (var != null) {
+            this.var = findString(var);
+        }
+    }
+    
+    /**
+     * To keep backward compatibility 
+     * TODO remove after 2.1
+     */
+    @StrutsTagAttribute(description="Deprecated. Use 'var' instead")
+    public void setId(String id) {
+        setVar(id);
+    }
+    
+    protected String getVar() {
+        return this.var;
+    }
+}

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java Sat Jul  7 10:04:06 2007
@@ -140,7 +140,7 @@
  *
  */
 @StrutsTag(name="date", tldBodyContent="empty", tldTagClass="org.apache.struts2.views.jsp.DateTag", description="Render a formatted date.")
-public class Date extends Component {
+public class Date extends ContextBean {
 
     private static final Log LOG = LogFactory.getLog(Date.class);
     /**
@@ -328,10 +328,10 @@
                 }
                 if (msg != null) {
                     try {
-                        if (getId() == null) {
+                        if (getVar() == null) {
                             writer.write(msg);
                         } else {
-                            stack.getContext().put(getId(), msg);
+                            putInContext(msg);
                         }
                     } catch (IOException e) {
                         LOG.error("Could not write out Date tag", e);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java Sat Jul  7 10:04:06 2007
@@ -72,9 +72,4 @@
 
         return !((ifResult == null) || (ifResult.booleanValue()));
     }
-    
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java Sat Jul  7 10:04:06 2007
@@ -105,9 +105,4 @@
     public void setTest(String test) {
         this.test = test;
     }
-    
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java Sat Jul  7 10:04:06 2007
@@ -133,9 +133,4 @@
     public void setName(String name) {
         this.name = name;
     }
-    
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java Sat Jul  7 10:04:06 2007
@@ -96,9 +96,4 @@
         stack.getContext().put(ANSWER, answer);
         return super.end(writer, body);
     }
-
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java Sat Jul  7 10:04:06 2007
@@ -172,11 +172,6 @@
     public void setValue(String value) {
         this.value = value;
     }
-    
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 
     public static String getContextRelativePath(ServletRequest request, String relativePath) {
         String returnValue;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java Sat Jul  7 10:04:06 2007
@@ -183,7 +183,7 @@
  *
  */
 @StrutsTag(name="iterator", tldTagClass="org.apache.struts2.views.jsp.IteratorTag", description="Iterate over a iterable value")
-public class IteratorComponent extends Component {
+public class IteratorComponent extends ContextBean {
     protected Iterator iterator;
     protected IteratorStatus status;
     protected Object oldStatus;
@@ -214,12 +214,12 @@
             Object currentValue = iterator.next();
             stack.push(currentValue);
 
-            String id = getId();
+            String var = getVar();
 
-            if ((id != null) && (currentValue != null)) {
+            if ((var != null) && (currentValue != null)) {
                 //pageContext.setAttribute(id, currentValue);
                 //pageContext.setAttribute(id, currentValue, PageContext.REQUEST_SCOPE);
-                stack.getContext().put(id, currentValue);
+                putInContext(currentValue);
             }
 
             // Status object
@@ -246,13 +246,7 @@
             Object currentValue = iterator.next();
             stack.push(currentValue);
 
-            String id = getId();
-
-            if (id != null) {
-                //pageContext.setAttribute(id, currentValue);
-                //pageContext.setAttribute(id, currentValue, PageContext.REQUEST_SCOPE);
-                stack.getContext().put(id, currentValue);
-            }
+            putInContext(currentValue);
 
             // Update status
             if (status != null) {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java Sat Jul  7 10:04:06 2007
@@ -130,7 +130,7 @@
  */
 @StrutsTag(name="merge", tldTagClass="org.apache.struts2.views.jsp.iterator.MergeIteratorTag", description="Merge the values " +
                 "of a list of iterators into one iterator")
-public class MergeIterator extends Component implements UnnamedParametric {
+public class MergeIterator extends ContextBean implements UnnamedParametric {
 
     private static final Log _log = LogFactory.getLog(MergeIterator.class);
 
@@ -163,18 +163,16 @@
         mergeIteratorFilter.execute();
 
         // if id exists, we put it in the stack's context
-        if (getId() != null && getId().length() > 0) {
-            getStack().getContext().put(getId(), mergeIteratorFilter);
-        }
+        putInContext(mergeIteratorFilter);
 
         mergeIteratorFilter = null;
 
         return super.end(writer, body);
     }
 
-    @StrutsTagAttribute(description="The id where the resultant merged iterator will be stored in the stack's context")
-    public void setId(String id) {
-        super.setId(id);
+    @StrutsTagAttribute(description="The name where the resultant merged iterator will be stored in the stack's context")
+    public void setVar(String var) {
+        super.setVar(var);
     }
 
     // == UnnamedParametric interface implementation ---------------------

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java Sat Jul  7 10:04:06 2007
@@ -143,9 +143,4 @@
     public void setListValue(String listValue) {
         internalUiBean.setListValue(listValue);
     }
-    
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java Sat Jul  7 10:04:06 2007
@@ -139,12 +139,6 @@
         this.value = value;
     }
     
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
-
-
     /**
      * Tags can implement this to support nested param tags without the <tt>name</tt> attribute.
      * <p/>

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java Sat Jul  7 10:04:06 2007
@@ -156,9 +156,4 @@
             return value;
         }
     }
-
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java Sat Jul  7 10:04:06 2007
@@ -149,8 +149,4 @@
         this.value = value;
     }
     
-    @StrutsTagSkipInheritance
-    public void setId(String id) {
-        super.setId(id);
-    }
 }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java Sat Jul  7 10:04:06 2007
@@ -114,7 +114,7 @@
  *
  */
 @StrutsTag(name="text", tldTagClass="org.apache.struts2.views.jsp.TextTag", description="Render a I18n text message")
-public class Text extends Component implements Param.UnnamedParametric {
+public class Text extends ContextBean implements Param.UnnamedParametric {
     private static final Log LOG = LogFactory.getLog(Text.class);
 
     protected List values = Collections.EMPTY_LIST;
@@ -163,10 +163,10 @@
 
         if (msg != null) {
             try {
-                if (getId() == null) {
+                if (getVar() == null) {
                     writer.write(msg);
                 } else {
-                    stack.getContext().put(getId(), msg);
+                    putInContext(msg);
                 }
             } catch (IOException e) {
                 LOG.error("Could not write out Text tag", e);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Sat Jul  7 10:04:06 2007
@@ -425,6 +425,7 @@
     // shortcut, sets label, name, and value
     protected String key;
 
+    protected String id;
     protected String cssClass;
     protected String cssStyle;
     protected String disabled;
@@ -925,6 +926,21 @@
                     + escape(name != null ? findString(name) : null));
         } else {
             addParameter("id", escape(name != null ? findString(name) : null));
+        }
+    }
+    
+    /**
+     * Get's the id for referencing element.
+     * @return the id for referencing element.
+     */
+    public String getId() {
+        return id;
+    }
+
+    @StrutsTagAttribute(description="HTML id attribute")
+    public void setId(String id) {
+        if (id != null) {
+            this.id = findString(id);
         }
     }
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Sat Jul  7 10:04:06 2007
@@ -109,7 +109,7 @@
  *
  */
 @StrutsTag(name="url", tldTagClass="org.apache.struts2.views.jsp.URLTag", description="This tag is used to create a URL")
-public class URL extends Component {
+public class URL extends ContextBean {
     private static final Log LOG = LogFactory.getLog(URL.class);
 
     /**
@@ -262,13 +262,13 @@
             result += '#' + anchor;
         }
 
-        String id = getId();
+        String var = getVar();
 
-        if (id != null) {
-            getStack().getContext().put(id, result);
+        if (var != null) {
+            putInContext(result);
 
             // add to the request and page scopes as well
-            req.setAttribute(id, result);
+            req.setAttribute(var, result);
         } else {
             try {
                 writer.write(result);

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java Sat Jul  7 10:04:06 2007
@@ -31,7 +31,7 @@
 /**
  * @see ActionComponent
  */
-public class ActionTag extends ComponentTagSupport {
+public class ActionTag extends ContextBeanTag {
 
     private static final long serialVersionUID = -5384167073331678855L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java Sat Jul  7 10:04:06 2007
@@ -34,7 +34,7 @@
 /**
  * @see Bean
  */
-public class BeanTag extends ComponentTagSupport {
+public class BeanTag extends ContextBeanTag {
 
     private static final long serialVersionUID = -3863152522071209267L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java Sat Jul  7 10:04:06 2007
@@ -26,10 +26,8 @@
 
 import org.apache.struts2.components.Component;
 import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
 
 import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.ValueStack;
 
 /**
@@ -61,7 +59,6 @@
     }
 
     protected void populateParams() {
-        component.setId(id);
     }
 
     public Component getComponent() {

Added: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java?view=auto&rev=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java (added)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java Sat Jul  7 10:04:06 2007
@@ -0,0 +1,47 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.views.jsp;
+
+import org.apache.struts2.components.ContextBean;
+
+
+public abstract class ContextBeanTag extends ComponentTagSupport {
+    private String var;
+
+    protected void populateParams() {
+        super.populateParams();
+        
+        ContextBean bean = (ContextBean) component;
+        bean.setVar(var);
+    }
+
+    public void setVar(String var) {
+        this.var = var;
+    }
+
+    /**
+     * To keep backward compatibility 
+     * TODO remove after 2.1
+     */
+    public void setId(String id) {
+        setVar(id);
+    }
+}

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java Sat Jul  7 10:04:06 2007
@@ -31,7 +31,7 @@
 /**
  * @see Date
  */
-public class DateTag extends ComponentTagSupport {
+public class DateTag extends ContextBeanTag {
 
     private static final long serialVersionUID = -6216963123295613440L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java Sat Jul  7 10:04:06 2007
@@ -32,7 +32,7 @@
 /**
  * @see IteratorComponent
  */
-public class IteratorTag extends ComponentTagSupport {
+public class IteratorTag extends ContextBeanTag {
 
     private static final long serialVersionUID = -1827978135193581901L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java Sat Jul  7 10:04:06 2007
@@ -32,7 +32,7 @@
 /**
  * @see Text
  */
-public class TextTag extends ComponentTagSupport {
+public class TextTag extends ContextBeanTag {
 
     private static final long serialVersionUID = -3075088084198264581L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java Sat Jul  7 10:04:06 2007
@@ -32,7 +32,7 @@
 /**
  * @see URL
  */
-public class URLTag extends ComponentTagSupport {
+public class URLTag extends ContextBeanTag {
 
     private static final long serialVersionUID = 1722460444125206226L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java Sat Jul  7 10:04:06 2007
@@ -25,7 +25,7 @@
 
 import org.apache.struts2.components.AppendIterator;
 import org.apache.struts2.components.Component;
-import org.apache.struts2.views.jsp.ComponentTagSupport;
+import org.apache.struts2.views.jsp.ContextBeanTag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
@@ -36,7 +36,7 @@
  *
  * @see AppendIterator
  */
-public class AppendIteratorTag extends ComponentTagSupport {
+public class AppendIteratorTag extends ContextBeanTag {
 
     private static final long serialVersionUID = -6017337859763283691L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java Sat Jul  7 10:04:06 2007
@@ -25,7 +25,7 @@
 
 import org.apache.struts2.components.Component;
 import org.apache.struts2.components.MergeIterator;
-import org.apache.struts2.views.jsp.ComponentTagSupport;
+import org.apache.struts2.views.jsp.ContextBeanTag;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
@@ -37,7 +37,7 @@
  * @see MergeIterator
  * @see org.apache.struts2.util.MergeIteratorFilter
  */
-public class MergeIteratorTag extends ComponentTagSupport {
+public class MergeIteratorTag extends ContextBeanTag {
 
     private static final long serialVersionUID = 4999729472466011218L;
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java Sat Jul  7 10:04:06 2007
@@ -59,7 +59,8 @@
     protected String onselect;
     protected String onchange;
     protected String accesskey;
-
+    protected String id;
+    
     protected String key;
 
     // tooltip attributes
@@ -112,8 +113,13 @@
         uiBean.setTooltipIconPath(tooltipIconPath);
         uiBean.setAccesskey(accesskey);
         uiBean.setKey(key);
+        uiBean.setId(id);
     }
 
+    public void setId(String id) {
+        this.id = id;
+    }
+    
     public void setCssClass(String cssClass) {
         this.cssClass = cssClass;
     }

Modified: struts/struts2/trunk/core/src/site/resources/tags/a.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/a.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/a.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/a.html Sat Jul  7 10:04:06 2007
@@ -73,7 +73,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/action.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/action.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/action.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/action.html Sat Jul  7 10:04:06 2007
@@ -49,7 +49,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">Deprecated. Use 'var' instead</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">ignoreContextParams</td>
@@ -74,6 +74,14 @@
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
 					<td align="left" valign="top">Namespace for action to call</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">var</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">Name used to reference the value pushed into the Value Stack</td>
 				</tr>
 		</table>
 		<!-- END SNIPPET: tagattributes -->

Modified: struts/struts2/trunk/core/src/site/resources/tags/actionerror.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/actionerror.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/actionerror.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/actionerror.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/actionmessage.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/append.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/append.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/append.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/append.html Sat Jul  7 10:04:06 2007
@@ -33,7 +33,15 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The id of which if supplied will have the resultant appended iterator stored under in the stack's context</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>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The name of which if supplied will have the resultant appended iterator stored under in the stack's context</td>
 				</tr>
 		</table>
 		<!-- END SNIPPET: tagattributes -->

Modified: struts/struts2/trunk/core/src/site/resources/tags/bean.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/bean.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/bean.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/bean.html Sat Jul  7 10:04:06 2007
@@ -33,7 +33,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">Deprecated. Use 'var' instead</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">name</td>
@@ -42,6 +42,14 @@
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
 					<td align="left" valign="top">The class name of the bean to be instantiated (must respect JavaBean specification)</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">var</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">Name used to reference the value pushed into the Value Stack</td>
 				</tr>
 		</table>
 		<!-- END SNIPPET: tagattributes -->

Modified: struts/struts2/trunk/core/src/site/resources/tags/checkbox.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/checkbox.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/checkbox.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/checkbox.html Sat Jul  7 10:04:06 2007
@@ -73,7 +73,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/combobox.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/combobox.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/combobox.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/combobox.html Sat Jul  7 10:04:06 2007
@@ -89,7 +89,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/component.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/component.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/component.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/component.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/date.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/date.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/date.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/date.html Sat Jul  7 10:04:06 2007
@@ -41,7 +41,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">Deprecated. Use 'var' instead</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">name</td>
@@ -58,6 +58,14 @@
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">Boolean</td>
 					<td align="left" valign="top">Whether to print out the date nicely</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">var</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">Name used to reference the value pushed into the Value Stack</td>
 				</tr>
 		</table>
 		<!-- END SNIPPET: tagattributes -->

Modified: struts/struts2/trunk/core/src/site/resources/tags/debug.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/debug.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/debug.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/debug.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/div.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/div.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/div.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/div.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html Sat Jul  7 10:04:06 2007
@@ -329,7 +329,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/fielderror.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/fielderror.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/fielderror.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/fielderror.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/file.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/file.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/file.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/file.html Sat Jul  7 10:04:06 2007
@@ -73,7 +73,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/form.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/form.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/form.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/form.html Sat Jul  7 10:04:06 2007
@@ -97,7 +97,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/head.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/head.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/head.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/head.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/hidden.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/hidden.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/hidden.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/hidden.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html Sat Jul  7 10:04:06 2007
@@ -129,7 +129,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/iterator.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/iterator.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/iterator.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/iterator.html Sat Jul  7 10:04:06 2007
@@ -33,7 +33,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">Deprecated. Use 'var' instead</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">status</td>
@@ -50,6 +50,14 @@
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
 					<td align="left" valign="top">the iteratable source to iterate over, else an the object itself will be put into a newly created List</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">var</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">Name used to reference the value pushed into the Value Stack</td>
 				</tr>
 		</table>
 		<!-- END SNIPPET: tagattributes -->

Modified: struts/struts2/trunk/core/src/site/resources/tags/label.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/label.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/label.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/label.html Sat Jul  7 10:04:06 2007
@@ -73,7 +73,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/merge.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/merge.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/merge.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/merge.html Sat Jul  7 10:04:06 2007
@@ -33,7 +33,15 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The id where the resultant merged iterator will be stored in the stack's context</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>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The name where the resultant merged iterator will be stored in the stack's context</td>
 				</tr>
 		</table>
 		<!-- END SNIPPET: tagattributes -->

Modified: struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html Sat Jul  7 10:04:06 2007
@@ -433,7 +433,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/password.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/password.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/password.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/password.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/radio.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/radio.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/radio.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/radio.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/reset.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/reset.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/reset.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/reset.html Sat Jul  7 10:04:06 2007
@@ -81,7 +81,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/select.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/select.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/select.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/select.html Sat Jul  7 10:04:06 2007
@@ -89,7 +89,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/set.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/set.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/set.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/set.html Sat Jul  7 10:04:06 2007
@@ -28,14 +28,6 @@
 				<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">true</td>
-					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</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>

Modified: struts/struts2/trunk/core/src/site/resources/tags/submit.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/submit.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/submit.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/submit.html Sat Jul  7 10:04:06 2007
@@ -81,7 +81,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/text.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/text.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/text.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/text.html Sat Jul  7 10:04:06 2007
@@ -33,7 +33,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">Deprecated. Use 'var' instead</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">name</td>
@@ -42,6 +42,14 @@
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
 					<td align="left" valign="top"> Name of resource property to fetch</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">var</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">Name used to reference the value pushed into the Value Stack</td>
 				</tr>
 		</table>
 		<!-- END SNIPPET: tagattributes -->

Modified: struts/struts2/trunk/core/src/site/resources/tags/textarea.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/textarea.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/textarea.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/textarea.html Sat Jul  7 10:04:06 2007
@@ -73,7 +73,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/textfield.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/textfield.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/textfield.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/textfield.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/token.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/token.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/token.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/token.html Sat Jul  7 10:04:06 2007
@@ -65,7 +65,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/updownselect.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/updownselect.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/updownselect.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/updownselect.html Sat Jul  7 10:04:06 2007
@@ -113,7 +113,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">HTML id attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">javascriptTooltip</td>

Modified: struts/struts2/trunk/core/src/site/resources/tags/url.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/url.html?view=diff&rev=554226&r1=554225&r2=554226
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/url.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/url.html Sat Jul  7 10:04:06 2007
@@ -57,7 +57,7 @@
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+					<td align="left" valign="top">Deprecated. Use 'var' instead</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">includeContext</td>
@@ -122,6 +122,14 @@
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
 					<td align="left" valign="top">The target value to use, if not using action</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">var</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">Name used to reference the value pushed into the Value Stack</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">windowState</td>



Mime
View raw message