tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r1037279 [10/10] - in /tomcat/taglibs/standard/trunk/impl: ./ src/main/java/org/apache/taglibs/standard/ src/main/java/org/apache/taglibs/standard/functions/ src/main/java/org/apache/taglibs/standard/tag/common/core/ src/main/java/org/apach...
Date Sat, 20 Nov 2010 17:57:49 GMT
Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/scriptfree.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/scriptfree.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/scriptfree.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/scriptfree.tld Sat Nov 20 17:57:45 2010
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-    version="2.0">
-  <description>
-    Validates JSP pages to prohibit use of scripting elements.
-  </description>
-  <tlib-version>1.1</tlib-version>
-  <short-name>scriptfree</short-name>
-  <uri>http://jakarta.apache.org/taglibs/standard/scriptfree</uri>
-
-  <validator>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
     <description>
-      Validates prohibitions against scripting elements.
+        Validates JSP pages to prohibit use of scripting elements.
     </description>
-    <validator-class>
-    javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
-    </validator-class>
-    <init-param>
-      <description>
-        Controls whether or not declarations are considered valid.
-      </description>
-      <param-name>allowDeclarations</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <description>
-        Controls whether or not scriptlets are considered valid.
-      </description>
-      <param-name>allowScriptlets</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <description>
-        Controls whether or not top-level expressions are considered valid.
-      </description>
-      <param-name>allowExpressions</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <description>
-        Controls whether or not expressions used to supply request-time
-        attribute values are considered valid.
-      </description>
-      <param-name>allowRTExpressions</param-name>
-      <param-value>false</param-value>
-    </init-param>
-  </validator>
+    <tlib-version>1.1</tlib-version>
+    <short-name>scriptfree</short-name>
+    <uri>http://jakarta.apache.org/taglibs/standard/scriptfree</uri>
+
+    <validator>
+        <description>
+            Validates prohibitions against scripting elements.
+        </description>
+        <validator-class>
+            javax.servlet.jsp.jstl.tlv.ScriptFreeTLV
+        </validator-class>
+        <init-param>
+            <description>
+                Controls whether or not declarations are considered valid.
+            </description>
+            <param-name>allowDeclarations</param-name>
+            <param-value>false</param-value>
+        </init-param>
+        <init-param>
+            <description>
+                Controls whether or not scriptlets are considered valid.
+            </description>
+            <param-name>allowScriptlets</param-name>
+            <param-value>false</param-value>
+        </init-param>
+        <init-param>
+            <description>
+                Controls whether or not top-level expressions are considered valid.
+            </description>
+            <param-name>allowExpressions</param-name>
+            <param-value>false</param-value>
+        </init-param>
+        <init-param>
+            <description>
+                Controls whether or not expressions used to supply request-time
+                attribute values are considered valid.
+            </description>
+            <param-name>allowRTExpressions</param-name>
+            <param-value>false</param-value>
+        </init-param>
+    </validator>
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0-rt.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0-rt.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0-rt.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0-rt.tld Sat Nov 20 17:57:45 2010
@@ -1,188 +1,188 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+        "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>sql_rt</short-name>
-  <uri>http://java.sun.com/jstl/sql_rt</uri>
-  <display-name>JSTL sql RT</display-name>
-  <description>JSTL 1.0 sql library</description>
-
-  <validator>
-    <validator-class>
-        org.apache.taglibs.standard.tlv.JstlSqlTLV
-    </validator-class>
-    <description>
-        Provides core validation features for JSTL tags.
-    </description>
-  </validator>
-
-  <tag>
-    <name>transaction</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.TransactionTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Provides nested database action elements with a shared Connection,
-        set up to execute all statements as one transaction.
-    </description>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>isolation</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>query</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.QueryTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Executes the SQL query defined in its body or through the
-        sql attribute.
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>sql</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>startRow</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>maxRows</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>update</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.UpdateTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Executes the SQL update defined in its body or through the
-        sql attribute.
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>sql</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Sets a parameter in an SQL statement to the specified value.
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>dateParam</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.DateParamTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Sets a parameter in an SQL statement to the specified java.util.Date value.
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>setDataSource</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.SetDataSourceTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Creates a simple DataSource suitable only for prototyping.
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>driver</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>url</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>user</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>password</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
+    <tlib-version>1.0</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>sql_rt</short-name>
+    <uri>http://java.sun.com/jstl/sql_rt</uri>
+    <display-name>JSTL sql RT</display-name>
+    <description>JSTL 1.0 sql library</description>
+
+    <validator>
+        <validator-class>
+            org.apache.taglibs.standard.tlv.JstlSqlTLV
+        </validator-class>
+        <description>
+            Provides core validation features for JSTL tags.
+        </description>
+    </validator>
+
+    <tag>
+        <name>transaction</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.TransactionTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Provides nested database action elements with a shared Connection,
+            set up to execute all statements as one transaction.
+        </description>
+        <attribute>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>isolation</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>query</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.QueryTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Executes the SQL query defined in its body or through the
+            sql attribute.
+        </description>
+        <attribute>
+            <name>var</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>sql</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>startRow</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>maxRows</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>update</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.UpdateTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Executes the SQL update defined in its body or through the
+            sql attribute.
+        </description>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>sql</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>param</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.ParamTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Sets a parameter in an SQL statement to the specified value.
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>dateParam</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.DateParamTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Sets a parameter in an SQL statement to the specified java.util.Date value.
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>setDataSource</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.SetDataSourceTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Creates a simple DataSource suitable only for prototyping.
+        </description>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>driver</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>url</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>user</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>password</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql.tld Sat Nov 20 17:57:45 2010
@@ -1,289 +1,289 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-    version="2.0">
-    
-  <description>JSTL 1.1 sql library</description>
-  <display-name>JSTL sql</display-name>
-  <tlib-version>1.1</tlib-version>
-  <short-name>sql</short-name>
-  <uri>http://java.sun.com/jsp/jstl/sql</uri>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
 
-  <validator>
-    <description>
-        Provides core validation features for JSTL tags.
-    </description>
-    <validator-class>
-        org.apache.taglibs.standard.tlv.JstlSqlTLV
-    </validator-class>
-  </validator>
+    <description>JSTL 1.1 sql library</description>
+    <display-name>JSTL sql</display-name>
+    <tlib-version>1.1</tlib-version>
+    <short-name>sql</short-name>
+    <uri>http://java.sun.com/jsp/jstl/sql</uri>
 
-  <tag>
-    <description>
-        Provides nested database action elements with a shared Connection,
-        set up to execute all statements as one transaction.
-    </description>
-    <name>transaction</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.TransactionTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
+    <validator>
         <description>
-DataSource associated with the database to access. A
-String value represents a relative path to a JNDI
-resource or the parameters for the JDBC
-DriverManager facility.
+            Provides core validation features for JSTL tags.
         </description>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Transaction isolation level. If not specified, it is the
-isolation level the DataSource has been configured
-with.
-        </description>
-        <name>isolation</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
+        <validator-class>
+            org.apache.taglibs.standard.tlv.JstlSqlTLV
+        </validator-class>
+    </validator>
 
-  <tag>
-    <description>
-        Executes the SQL query defined in its body or through the
-        sql attribute.
-    </description>
-    <name>query</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.QueryTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-query result. The type of the scoped variable is
-javax.servlet.jsp.jstl.sql.
-Result (see Chapter 16 "Java APIs").
-        </description>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-SQL query statement.
-        </description>
-        <name>sql</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
+    <tag>
         <description>
-Data source associated with the database to
-query. A String value represents a relative path
-to a JNDI resource or the parameters for the
-DriverManager class.
+            Provides nested database action elements with a shared Connection,
+            set up to execute all statements as one transaction.
         </description>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-The returned Result object includes the rows
-starting at the specified index. The first row of
-the original query result set is at index 0. If not
-specified, rows are included starting from the
-first row at index 0.
-        </description>
-        <name>startRow</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-The maximum number of rows to be included in
-the query result. If not specified, or set to -1, no
-limit on the maximum number of rows is
-enforced.
-        </description>
-        <name>maxRows</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
+        <name>transaction</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.TransactionTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                DataSource associated with the database to access. A
+                String value represents a relative path to a JNDI
+                resource or the parameters for the JDBC
+                DriverManager facility.
+            </description>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Transaction isolation level. If not specified, it is the
+                isolation level the DataSource has been configured
+                with.
+            </description>
+            <name>isolation</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
 
-  <tag>
-    <description>
-        Executes the SQL update defined in its body or through the
-        sql attribute.
-    </description>
-    <name>update</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.UpdateTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the result
-of the database update. The type of the scoped
-variable is java.lang.Integer.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope of var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
+    <tag>
         <description>
-SQL update statement.
+            Executes the SQL query defined in its body or through the
+            sql attribute.
         </description>
-        <name>sql</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Data source associated with the database to update.
-A String value represents a relative path to a JNDI
-resource or the parameters for the JDBC
-DriverManager class.
-        </description>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
+        <name>query</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.QueryTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Name of the exported scoped variable for the
+                query result. The type of the scoped variable is
+                javax.servlet.jsp.jstl.sql.
+                Result (see Chapter 16 "Java APIs").
+            </description>
+            <name>var</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                SQL query statement.
+            </description>
+            <name>sql</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Data source associated with the database to
+                query. A String value represents a relative path
+                to a JNDI resource or the parameters for the
+                DriverManager class.
+            </description>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                The returned Result object includes the rows
+                starting at the specified index. The first row of
+                the original query result set is at index 0. If not
+                specified, rows are included starting from the
+                first row at index 0.
+            </description>
+            <name>startRow</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                The maximum number of rows to be included in
+                the query result. If not specified, or set to -1, no
+                limit on the maximum number of rows is
+                enforced.
+            </description>
+            <name>maxRows</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
 
-  <tag>
-    <description>
-        Sets a parameter in an SQL statement to the specified value.
-    </description>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
+    <tag>
         <description>
-Parameter value.
+            Executes the SQL update defined in its body or through the
+            sql attribute.
         </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
+        <name>update</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.UpdateTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Name of the exported scoped variable for the result
+                of the database update. The type of the scoped
+                variable is java.lang.Integer.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope of var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                SQL update statement.
+            </description>
+            <name>sql</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Data source associated with the database to update.
+                A String value represents a relative path to a JNDI
+                resource or the parameters for the JDBC
+                DriverManager class.
+            </description>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
 
-  <tag>
-    <description>
-        Sets a parameter in an SQL statement to the specified java.util.Date value.
-    </description>
-    <name>dateParam</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.DateParamTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Parameter value for DATE, TIME, or
-TIMESTAMP column in a database table.
-        </description>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
+    <tag>
         <description>
-One of "date", "time" or "timestamp".
+            Sets a parameter in an SQL statement to the specified value.
         </description>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
+        <name>param</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.ParamTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Parameter value.
+            </description>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
 
-  <tag>
-    <description>
-        Creates a simple DataSource suitable only for prototyping.
-    </description>
-    <name>setDataSource</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.sql.SetDataSourceTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable
-for the data source specified. Type can
-be String or DataSource.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-If var is specified, scope of the
-exported variable. Otherwise, scope of
-the data source configuration variable.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
+    <tag>
         <description>
-Data source. If specified as a string, it
-can either be a relative path to a JNDI
-resource, or a JDBC parameters string
-as defined in Section 10.1.1.
+            Sets a parameter in an SQL statement to the specified java.util.Date value.
         </description>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-JDBC parameter: driver class name.
-        </description>
-        <name>driver</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-JDBC parameter: URL associated with
-the database.
-        </description>
-        <name>url</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-JDBC parameter: database user on
-whose behalf the connection to the
-database is being made.
-        </description>
-        <name>user</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
+        <name>dateParam</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.DateParamTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                Parameter value for DATE, TIME, or
+                TIMESTAMP column in a database table.
+            </description>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                One of "date", "time" or "timestamp".
+            </description>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
         <description>
-JDBC parameter: user password
+            Creates a simple DataSource suitable only for prototyping.
         </description>
-        <name>password</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
+        <name>setDataSource</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.sql.SetDataSourceTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                Name of the exported scoped variable
+                for the data source specified. Type can
+                be String or DataSource.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                If var is specified, scope of the
+                exported variable. Otherwise, scope of
+                the data source configuration variable.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Data source. If specified as a string, it
+                can either be a relative path to a JNDI
+                resource, or a JDBC parameters string
+                as defined in Section 10.1.1.
+            </description>
+            <name>dataSource</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                JDBC parameter: driver class name.
+            </description>
+            <name>driver</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                JDBC parameter: URL associated with
+                the database.
+            </description>
+            <name>url</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                JDBC parameter: database user on
+                whose behalf the connection to the
+                database is being made.
+            </description>
+            <name>user</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                JDBC parameter: user password
+            </description>
+            <name>password</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0-rt.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0-rt.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0-rt.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0-rt.tld Sat Nov 20 17:57:45 2010
@@ -1,256 +1,256 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+        "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
 <taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>x_rt</short-name>
-  <uri>http://java.sun.com/jstl/xml_rt</uri>
-  <display-name>JSTL XML RT</display-name>
-  <description>JSTL 1.0 XML library</description>
-
-  <validator>
-    <validator-class>
-	org.apache.taglibs.standard.tlv.JstlXmlTLV
-    </validator-class>
-    <description>
-        Provides validation features for JSTL XML tags.
-    </description>
-  </validator>
-
-  <tag>
-    <name>choose</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Simple conditional tag that establishes a context for
-        mutually exclusive conditional operations, marked by
-        &lt;when&gt; and &lt;otherwise&gt;
-    </description>
-  </tag>
-
-  <tag>
-    <name>out</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-	Like &lt;%= ... &gt;, but for XPath expressions.
-    </description>
-    <attribute>
-        <name>select</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>escapeXml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>if</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        XML conditional tag, which evalutes its body if the
-        supplied XPath expression evalutes to 'true' as a boolean
-    </description>
-    <attribute>
-        <name>select</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>forEach</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-	XML iteration tag.
-    </description>
-    <attribute>
-	<name>var</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-	<name>select</name>
-	<required>true</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>otherwise</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-	Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
-	and runs only if all of the prior conditions evaluated to
-	'false'
-    </description>
-  </tag>
-
-  <tag>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Adds a parameter to a containing 'transform' tag's Transformer
-    </description>
-    <attribute>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>parse</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
-    <body-content>JSP</body-content>
-    <description>
-	Parses XML content from 'source' attribute or 'body'
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>varDom</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scopeDom</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>xml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>systemId</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>filter</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>set</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-	Saves the result of an XPath expression evaluation in a 'scope'
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-	<name>select</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>transform</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
-    <body-content>JSP</body-content>
-    <description>
-	Conducts a transformation given a source XML document
-	and an XSLT stylesheet
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>result</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>xml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>xmlSystemId</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-	<name>xslt</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-	<name>xsltSystemId</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>when</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Subtag of &lt;choose&gt; that includes its body if its
-        expression evalutes to 'true'
-    </description>
-    <attribute>
-        <name>select</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
+    <tlib-version>1.0</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>x_rt</short-name>
+    <uri>http://java.sun.com/jstl/xml_rt</uri>
+    <display-name>JSTL XML RT</display-name>
+    <description>JSTL 1.0 XML library</description>
+
+    <validator>
+        <validator-class>
+            org.apache.taglibs.standard.tlv.JstlXmlTLV
+        </validator-class>
+        <description>
+            Provides validation features for JSTL XML tags.
+        </description>
+    </validator>
+
+    <tag>
+        <name>choose</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Simple conditional tag that establishes a context for
+            mutually exclusive conditional operations, marked by
+            &lt;when&gt; and &lt;otherwise&gt;
+        </description>
+    </tag>
+
+    <tag>
+        <name>out</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Like &lt;%= ... &gt;, but for XPath expressions.
+        </description>
+        <attribute>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>escapeXml</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>if</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            XML conditional tag, which evalutes its body if the
+            supplied XPath expression evalutes to 'true' as a boolean
+        </description>
+        <attribute>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>forEach</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            XML iteration tag.
+        </description>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>otherwise</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
+            and runs only if all of the prior conditions evaluated to
+            'false'
+        </description>
+    </tag>
+
+    <tag>
+        <name>param</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Adds a parameter to a containing 'transform' tag's Transformer
+        </description>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>parse</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
+        <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
+        <body-content>JSP</body-content>
+        <description>
+            Parses XML content from 'source' attribute or 'body'
+        </description>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>varDom</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scopeDom</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>xml</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>systemId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>filter</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>set</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
+        <body-content>empty</body-content>
+        <description>
+            Saves the result of an XPath expression evaluation in a 'scope'
+        </description>
+        <attribute>
+            <name>var</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>select</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>transform</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
+        <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
+        <body-content>JSP</body-content>
+        <description>
+            Conducts a transformation given a source XML document
+            and an XSLT stylesheet
+        </description>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>result</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>xml</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>xmlSystemId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>xslt</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>xsltSystemId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>when</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            Subtag of &lt;choose&gt; that includes its body if its
+            expression evalutes to 'true'
+        </description>
+        <attribute>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
 
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x.tld?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x.tld (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x.tld Sat Nov 20 17:57:45 2010
@@ -1,448 +1,448 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-    version="2.0">
-    
-  <description>JSTL 1.1 XML library</description>
-  <display-name>JSTL XML</display-name>
-  <tlib-version>1.1</tlib-version>
-  <short-name>x</short-name>
-  <uri>http://java.sun.com/jsp/jstl/xml</uri>
-
-  <validator>
-    <description>
-        Provides validation features for JSTL XML tags.
-    </description>
-    <validator-class>
-	org.apache.taglibs.standard.tlv.JstlXmlTLV
-    </validator-class>
-  </validator>
-
-  <tag>
-    <description>
-        Simple conditional tag that establishes a context for
-        mutually exclusive conditional operations, marked by
-        &lt;when&gt; and &lt;otherwise&gt;
-    </description>
-    <name>choose</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
-    <body-content>JSP</body-content>
-  </tag>
-
-  <tag>
-    <description>
-	Like &lt;%= ... &gt;, but for XPath expressions.
-    </description>
-    <name>out</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-XPath expression to be evaluated.
-        </description>
-        <name>select</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Determines whether characters &lt;,&gt;,&amp;,'," in the
-resulting string should be converted to their
-corresponding character entity codes. Default
-value is true.
-        </description>
-        <name>escapeXml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        XML conditional tag, which evalutes its body if the
-        supplied XPath expression evalutes to 'true' as a boolean
-    </description>
-    <name>if</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The test condition that tells whether or not the
-body content should be processed.
-        </description>
-        <name>select</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-resulting value of the test condition. The type
-of the scoped variable is Boolean.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	XML iteration tag.
-    </description>
-    <name>forEach</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-current item of the iteration. This scoped variable
-has nested visibility. Its type depends on the
-result of the XPath expression in the select
-attribute.
-        </description>
-	<name>var</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-XPath expression to be evaluated.
-        </description>
-	<name>select</name>
-	<required>true</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Iteration begins at the item located at the
-specified index. First item of the collection has
-index 0.
-        </description>
-	<name>begin</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration ends at the item located at the specified
-index (inclusive).
-        </description>
-	<name>end</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Iteration will only process every step items of
-the collection, starting with the first one.
-        </description>
-	<name>step</name>
-	<required>false</required>
-	<rtexprvalue>true</rtexprvalue>
-	<type>int</type>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for the
-status of the iteration. Object exported is of type
-javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
-        </description>
-	<name>varStatus</name>
-	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
-	and runs only if all of the prior conditions evaluated to
-	'false'
-    </description>
-    <name>otherwise</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
-    <body-content>JSP</body-content>
-  </tag>
-
-  <tag>
-    <description>
-        Adds a parameter to a containing 'transform' tag's Transformer
-    </description>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the transformation parameter.
-        </description>
-        <name>name</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Value of the parameter.
-        </description>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Parses XML content from 'source' attribute or 'body'
-    </description>
-    <name>parse</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable for
-the parsed XML document. The type of the
-scoped variable is implementation
-dependent.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Name of the exported scoped variable for
-the parsed XML document. The type of the
-scoped variable is
-org.w3c.dom.Document.
-        </description>
-        <name>varDom</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for varDom.
-        </description>
-        <name>scopeDom</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Deprecated. Use attribute 'doc' instead.
-        </description>
-        <name>xml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Source XML document to be parsed.
-        </description>
-        <name>doc</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-The system identifier (URI) for parsing the
-XML document.
-        </description>
-        <name>systemId</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Filter to be applied to the source
-document.
-        </description>
-        <name>filter</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Saves the result of an XPath expression evaluation in a 'scope'
-    </description>
-    <name>set</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
-    <body-content>empty</body-content>
-    <attribute>
-        <description>
-Name of the exported scoped variable to hold
-the value specified in the action. The type of the
-scoped variable is whatever type the select
-expression evaluates to.
-        </description>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-XPath expression to be evaluated.
-        </description>
-	<name>select</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-	Conducts a transformation given a source XML document
-	and an XSLT stylesheet
-    </description>
-    <name>transform</name>
-    <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-Name of the exported
-scoped variable for the
-transformed XML
-document. The type of the
-scoped variable is
-org.w3c.dom.Document.
-        </description>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Scope for var.
-        </description>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Result
-Object that captures or
-processes the transformation
-result.
-        </description>
-        <name>result</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Deprecated. Use attribute
-'doc' instead.
-        </description>
-        <name>xml</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Source XML document to be
-transformed. (If exported by
-&lt;x:set&gt;, it must correspond
-to a well-formed XML
-document, not a partial
-document.)
-        </description>
-        <name>doc</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-Deprecated. Use attribute
-'docSystemId' instead.
-        </description>
-        <name>xmlSystemId</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-The system identifier (URI)
-for parsing the XML
-document.
-        </description>
-        <name>docSystemId</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-javax.xml.transform.Source
-Transformation stylesheet as
-a String, Reader, or
-Source object.
-        </description>
-	<name>xslt</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <description>
-The system identifier (URI)
-for parsing the XSLT
-stylesheet.
-        </description>
-	<name>xsltSystemId</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <description>
-        Subtag of &lt;choose&gt; that includes its body if its
-        expression evalutes to 'true'
-    </description>
-    <name>when</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
-    <body-content>JSP</body-content>
-    <attribute>
-        <description>
-The test condition that tells whether or
-not the body content should be
-processed
-        </description>
-        <name>select</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
+
+    <description>JSTL 1.1 XML library</description>
+    <display-name>JSTL XML</display-name>
+    <tlib-version>1.1</tlib-version>
+    <short-name>x</short-name>
+    <uri>http://java.sun.com/jsp/jstl/xml</uri>
+
+    <validator>
+        <description>
+            Provides validation features for JSTL XML tags.
+        </description>
+        <validator-class>
+            org.apache.taglibs.standard.tlv.JstlXmlTLV
+        </validator-class>
+    </validator>
+
+    <tag>
+        <description>
+            Simple conditional tag that establishes a context for
+            mutually exclusive conditional operations, marked by
+            &lt;when&gt; and &lt;otherwise&gt;
+        </description>
+        <name>choose</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+
+    <tag>
+        <description>
+            Like &lt;%= ... &gt;, but for XPath expressions.
+        </description>
+        <name>out</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                XPath expression to be evaluated.
+            </description>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Determines whether characters &lt;,&gt;,&amp;,'," in the
+                resulting string should be converted to their
+                corresponding character entity codes. Default
+                value is true.
+            </description>
+            <name>escapeXml</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            XML conditional tag, which evalutes its body if the
+            supplied XPath expression evalutes to 'true' as a boolean
+        </description>
+        <name>if</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                The test condition that tells whether or not the
+                body content should be processed.
+            </description>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable for the
+                resulting value of the test condition. The type
+                of the scoped variable is Boolean.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope for var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            XML iteration tag.
+        </description>
+        <name>forEach</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Name of the exported scoped variable for the
+                current item of the iteration. This scoped variable
+                has nested visibility. Its type depends on the
+                result of the XPath expression in the select
+                attribute.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                XPath expression to be evaluated.
+            </description>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Iteration begins at the item located at the
+                specified index. First item of the collection has
+                index 0.
+            </description>
+            <name>begin</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <type>int</type>
+        </attribute>
+        <attribute>
+            <description>
+                Iteration ends at the item located at the specified
+                index (inclusive).
+            </description>
+            <name>end</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <type>int</type>
+        </attribute>
+        <attribute>
+            <description>
+                Iteration will only process every step items of
+                the collection, starting with the first one.
+            </description>
+            <name>step</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <type>int</type>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable for the
+                status of the iteration. Object exported is of type
+                javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+            </description>
+            <name>varStatus</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
+            and runs only if all of the prior conditions evaluated to
+            'false'
+        </description>
+        <name>otherwise</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+
+    <tag>
+        <description>
+            Adds a parameter to a containing 'transform' tag's Transformer
+        </description>
+        <name>param</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Name of the transformation parameter.
+            </description>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Value of the parameter.
+            </description>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Parses XML content from 'source' attribute or 'body'
+        </description>
+        <name>parse</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
+        <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Name of the exported scoped variable for
+                the parsed XML document. The type of the
+                scoped variable is implementation
+                dependent.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Name of the exported scoped variable for
+                the parsed XML document. The type of the
+                scoped variable is
+                org.w3c.dom.Document.
+            </description>
+            <name>varDom</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope for var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope for varDom.
+            </description>
+            <name>scopeDom</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Deprecated. Use attribute 'doc' instead.
+            </description>
+            <name>xml</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Source XML document to be parsed.
+            </description>
+            <name>doc</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                The system identifier (URI) for parsing the
+                XML document.
+            </description>
+            <name>systemId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Filter to be applied to the source
+                document.
+            </description>
+            <name>filter</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Saves the result of an XPath expression evaluation in a 'scope'
+        </description>
+        <name>set</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <description>
+                Name of the exported scoped variable to hold
+                the value specified in the action. The type of the
+                scoped variable is whatever type the select
+                expression evaluates to.
+            </description>
+            <name>var</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                XPath expression to be evaluated.
+            </description>
+            <name>select</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope for var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Conducts a transformation given a source XML document
+            and an XSLT stylesheet
+        </description>
+        <name>transform</name>
+        <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
+        <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                Name of the exported
+                scoped variable for the
+                transformed XML
+                document. The type of the
+                scoped variable is
+                org.w3c.dom.Document.
+            </description>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Scope for var.
+            </description>
+            <name>scope</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Result
+                Object that captures or
+                processes the transformation
+                result.
+            </description>
+            <name>result</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Deprecated. Use attribute
+                'doc' instead.
+            </description>
+            <name>xml</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Source XML document to be
+                transformed. (If exported by
+                &lt;x:set&gt;, it must correspond
+                to a well-formed XML
+                document, not a partial
+                document.)
+            </description>
+            <name>doc</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                Deprecated. Use attribute
+                'docSystemId' instead.
+            </description>
+            <name>xmlSystemId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                The system identifier (URI)
+                for parsing the XML
+                document.
+            </description>
+            <name>docSystemId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                javax.xml.transform.Source
+                Transformation stylesheet as
+                a String, Reader, or
+                Source object.
+            </description>
+            <name>xslt</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>
+                The system identifier (URI)
+                for parsing the XSLT
+                stylesheet.
+            </description>
+            <name>xsltSystemId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <description>
+            Subtag of &lt;choose&gt; that includes its body if its
+            expression evalutes to 'true'
+        </description>
+        <name>when</name>
+        <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <description>
+                The test condition that tells whether or
+                not the body content should be
+                processed
+            </description>
+            <name>select</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
 
 </taglib>

Modified: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java Sat Nov 20 17:57:45 2010
@@ -17,10 +17,10 @@
 
 package org.apache.taglibs.standard;
 
-import junit.framework.*;
+import junit.framework.TestCase;
 
 public class VersionTest
-    extends TestCase {
+        extends TestCase {
     private Version version = null;
 
     public VersionTest(String name) {

Modified: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java Sat Nov 20 17:57:45 2010
@@ -16,15 +16,25 @@
  */
 package org.apache.taglibs.standard.functions;
 
+import java.util.Arrays;
+import java.util.Collections;
+
+import javax.servlet.jsp.JspTagException;
+
 import org.apache.taglibs.standard.resources.Resources;
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.servlet.jsp.JspTagException;
-import java.util.Arrays;
-import java.util.Collections;
+import static org.apache.taglibs.standard.functions.Functions.endsWith;
+import static org.apache.taglibs.standard.functions.Functions.escapeXml;
+import static org.apache.taglibs.standard.functions.Functions.join;
+import static org.apache.taglibs.standard.functions.Functions.length;
+import static org.apache.taglibs.standard.functions.Functions.replace;
+import static org.apache.taglibs.standard.functions.Functions.split;
+import static org.apache.taglibs.standard.functions.Functions.substring;
+import static org.apache.taglibs.standard.functions.Functions.substringAfter;
+import static org.apache.taglibs.standard.functions.Functions.substringBefore;
 
-import static org.apache.taglibs.standard.functions.Functions.*;
 /**
  */
 public class FunctionsTest {
@@ -104,10 +114,10 @@ public class FunctionsTest {
     public void testLength() throws Exception {
         Assert.assertEquals(0, length(null));
         Assert.assertEquals(0, length(""));
-        Assert.assertEquals(3, length(new int[]{1,2,3}));
-        Assert.assertEquals(3, length(Arrays.asList(1,2,3)));
-        Assert.assertEquals(3, length(Arrays.asList(1,2,3).iterator()));
-        Assert.assertEquals(3, length(Collections.enumeration(Arrays.asList(1,2,3))));
+        Assert.assertEquals(3, length(new int[]{1, 2, 3}));
+        Assert.assertEquals(3, length(Arrays.asList(1, 2, 3)));
+        Assert.assertEquals(3, length(Arrays.asList(1, 2, 3).iterator()));
+        Assert.assertEquals(3, length(Collections.enumeration(Arrays.asList(1, 2, 3))));
         Assert.assertEquals(1, length(Collections.singletonMap("Hello", "World")));
         try {
             length(3);

Modified: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java Sat Nov 20 17:57:45 2010
@@ -16,11 +16,7 @@
  */
 package org.apache.taglibs.standard.tag.common.core;
 
-import org.apache.taglibs.standard.resources.Resources;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import java.util.Map;
 
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;
@@ -33,7 +29,11 @@ import javax.servlet.jsp.JspTagException
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.BodyContent;
 
-import java.util.Map;
+import org.apache.taglibs.standard.resources.Resources;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;

Modified: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java Sat Nov 20 17:57:45 2010
@@ -36,6 +36,7 @@ public class BundleSupportTest {
     }
 
     // test for bugzilla #49900 that bodyContent is not released
+
     @Test
     public void testBodyContentIsRelease() {
         BodyContent b = EasyMock.createMock(BodyContent.class);

Modified: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java Sat Nov 20 17:57:45 2010
@@ -16,17 +16,18 @@
  */
 package org.apache.taglibs.standard.util;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.servlet.jsp.JspWriter;
-
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
-import static org.apache.taglibs.standard.util.EscapeXML.*;
+import javax.servlet.jsp.JspWriter;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.taglibs.standard.util.EscapeXML.emit;
+import static org.apache.taglibs.standard.util.EscapeXML.escape;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message