Index: lams_monitoring/web/WEB-INF/jstl/x.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/jstl/Attic/x.tld,v
diff -u -r1.1 -r1.2
--- lams_monitoring/web/WEB-INF/jstl/x.tld	15 Apr 2005 04:38:10 -0000	1.1
+++ lams_monitoring/web/WEB-INF/jstl/x.tld	19 Apr 2005 05:46:57 -0000	1.2
@@ -1,444 +1,269 @@
-<?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>
+<?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">
+<taglib>
+  <tlib-version>1.0</tlib-version>
+  <jsp-version>1.2</jsp-version>
   <short-name>x</short-name>
-  <uri>http://java.sun.com/jsp/jstl/xml</uri>
+  <uri>http://java.sun.com/jstl/xml</uri>
+  <display-name>JSTL XML</display-name>
+  <description>JSTL 1.0 XML library</description>
 
   <validator>
-    <description>
-        Provides validation features for JSTL XML tags.
-    </description>
     <validator-class>
 	org.apache.taglibs.standard.tlv.JstlXmlTLV
     </validator-class>
+    <init-param>
+	<param-name>expressionAttributes</param-name>
+	<param-value>
+	    out:escapeXml
+	    parse:xml
+	    parse:systemId
+	    parse:filter
+	    transform:xml
+	    transform:xmlSystemId
+	    transform:xslt
+	    transform:xsltSystemId
+	    transform:result
+	</param-value>
+	<description>
+	    Whitespace-separated list of colon-separated token pairs
+	    describing tag:attribute combinations that accept expressions.
+	    The validator uses this information to determine which
+	    attributes need their syntax validated.
+	</description>
+     </init-param>
   </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>
-    <name>choose</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
-    <body-content>JSP</body-content>
   </tag>
 
   <tag>
+    <name>out</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.xml.ExprTag</tag-class>
+    <body-content>empty</body-content>
     <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>
+        <rtexprvalue>false</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>
+    <description>
+      XML conditional tag, which evalutes its body if the
+      supplied XPath expression evalutes to 'true' as a boolean
+    </description>
     <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>
+    <description>
+	XML iteration tag.
+    </description>
     <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>
+    <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>
-    <name>otherwise</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
-    <body-content>JSP</body-content>
   </tag>
 
   <tag>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.xml.ParamTag</tag-class>
+    <body-content>JSP</body-content>
     <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>
+        <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
-        <description>
-Value of the parameter.
-        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
+        <rtexprvalue>false</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>
+    <tag-class>org.apache.taglibs.standard.tag.el.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>
-        <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>
+        <rtexprvalue>false</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>
+        <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
-        <description>
-Filter to be applied to the source
-document.
-        </description>
         <name>filter</name>
         <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
+        <rtexprvalue>false</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>
+    <description>
+	Saves the result of an XPath expression evaluation in a 'scope'
+    </description>
     <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>
+    <name>transform</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.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>
-    <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>
+        <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
-        <description>
-Deprecated. Use attribute
-'doc' instead.
-        </description>
         <name>xml</name>
         <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
+        <rtexprvalue>false</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>
+        <rtexprvalue>false</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>
+        <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
-        <description>
-The system identifier (URI)
-for parsing the XSLT
-stylesheet.
-        </description>
 	<name>xsltSystemId</name>
         <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
+        <rtexprvalue>false</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>
-    <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>