geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jarek Gawor" <jga...@gmail.com>
Subject Re: svn commit: r601048 [1/5] - in /geronimo/specs/trunk: ./ geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/ geronimo-saaj_1.1_spec/ geronimo-saaj_1.3_spec/ geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/
Date Tue, 04 Dec 2007 19:33:34 GMT
In Geronimo we use Axis2 SAAJ 1.3 API... I would rather not introduce
yet another version of this spec API. Why is this necessary?

Jarek

On Dec 4, 2007 2:25 PM,  <gnodet@apache.org> wrote:
> Author: gnodet
> Date: Tue Dec  4 11:25:44 2007
> New Revision: 601048
>
> URL: http://svn.apache.org/viewvc?rev=601048&view=rev
> Log:
> Add missing jsp resources, upgrade saaj to 1.3 spec
>
> Added:
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd   (with props)
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd   (with props)
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd   (with props)
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd   (with props)
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd   (with props)
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd   (with props)
>     geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/
>       - copied from r600870, geronimo/specs/trunk/geronimo-saaj_1.1_spec/
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SAAJMetaFactory.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SAAJResult.java
> Removed:
>     geronimo/specs/trunk/geronimo-saaj_1.1_spec/
> Modified:
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/AttachmentPart.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/Detail.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/DetailEntry.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/FactoryFinder.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/MessageFactory.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/MimeHeader.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/MimeHeaders.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/Name.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/Node.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPBody.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPBodyElement.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPConnection.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPConnectionFactory.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPConstants.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPElement.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPElementFactory.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPEnvelope.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPException.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPFactory.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPFault.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPFaultElement.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPHeader.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPHeaderElement.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPMessage.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/SOAPPart.java
>     geronimo/specs/trunk/geronimo-saaj_1.3_spec/src/main/java/javax/xml/soap/Text.java
>     geronimo/specs/trunk/pom.xml
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,70 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +
> +<!--
> +  Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +
> +<!--
> +  **  The actual Sun XSD for this stripped down XSD can be found at
> +  **  http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd
> +  **  This XSD contains only the functional elements for programatic use.
> +-->
> +
> +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
> +            targetNamespace="http://java.sun.com/xml/ns/j2ee"
> +            xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
> +            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> +            elementFormDefault="qualified"
> +            attributeFormDefault="unqualified" version="2.0">
> +
> +    <xsd:include schemaLocation="j2ee_1_4.xsd" />
> +
> +    <xsd:complexType name="jsp-configType">
> +        <xsd:sequence>
> +            <xsd:element name="taglib" type="j2ee:taglibType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="jsp-property-group" type="j2ee:jsp-property-groupType" minOccurs="0" maxOccurs="unbounded" />
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="jsp-fileType">
> +        <xsd:simpleContent>
> +            <xsd:restriction base="j2ee:pathType" />
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="jsp-property-groupType">
> +        <xsd:sequence>
> +            <xsd:group ref="j2ee:descriptionGroup" />
> +            <xsd:element name="url-pattern" type="j2ee:url-patternType" maxOccurs="unbounded" />
> +            <xsd:element name="el-ignored" type="j2ee:true-falseType" minOccurs="0"></xsd:element>
> +            <xsd:element name="page-encoding" type="j2ee:string" minOccurs="0"></xsd:element>
> +            <xsd:element name="scripting-invalid" type="j2ee:true-falseType" minOccurs="0"></xsd:element>
> +            <xsd:element name="is-xml" type="j2ee:true-falseType" minOccurs="0"></xsd:element>
> +            <xsd:element name="include-prelude" type="j2ee:pathType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +            <xsd:element name="include-coda" type="j2ee:pathType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="taglibType">
> +        <xsd:sequence>
> +            <xsd:element name="taglib-uri" type="j2ee:string"></xsd:element>
> +            <xsd:element name="taglib-location" type="j2ee:pathType"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +</xsd:schema>
>
> Propchange: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd
> ------------------------------------------------------------------------------
>     svn:executable = *
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,73 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +
> +<!--
> +  Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +
> +<!--
> +  **  The actual Sun XSD for this stripped down XSD can be found at
> +  **  http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd
> +  **  This XSD contains only the functional elements for programatic use.
> +-->
> +
> +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
> +            targetNamespace="http://java.sun.com/xml/ns/javaee"
> +            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
> +            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> +            elementFormDefault="qualified"
> +            attributeFormDefault="unqualified"
> +            version="2.1">
> +
> +    <xsd:include schemaLocation="javaee_5.xsd" />
> +
> +    <xsd:complexType name="jsp-configType">
> +        <xsd:sequence>
> +            <xsd:element name="taglib" type="javaee:taglibType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="jsp-property-group" type="javaee:jsp-property-groupType" minOccurs="0" maxOccurs="unbounded" />
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="jsp-fileType">
> +        <xsd:simpleContent>
> +            <xsd:restriction base="javaee:pathType" />
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="jsp-property-groupType">
> +        <xsd:sequence>
> +            <xsd:group ref="javaee:descriptionGroup"/>
> +            <xsd:element name="url-pattern" type="javaee:url-patternType" maxOccurs="unbounded" />
> +            <xsd:element name="el-ignored" type="javaee:true-falseType" minOccurs="0" />
> +            <xsd:element name="page-encoding" type="javaee:string" minOccurs="0" />
> +            <xsd:element name="scripting-invalid" type="javaee:true-falseType" minOccurs="0" />
> +            <xsd:element name="is-xml" type="javaee:true-falseType" minOccurs="0" />
> +            <xsd:element name="include-prelude" type="javaee:pathType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="include-coda" type="javaee:pathType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="deferred-syntax-allowed-as-literal" type="javaee:true-falseType" minOccurs="0" />
> +            <xsd:element name="trim-directive-whitespaces" type="javaee:true-falseType" minOccurs="0" />
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="taglibType">
> +        <xsd:sequence>
> +            <xsd:element name="taglib-uri" type="javaee:string" />
> +            <xsd:element name="taglib-location" type="javaee:pathType" />
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +</xsd:schema>
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,190 @@
> +<!--
> + Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +<!-- DTD for JSP 2.0
> +     thanks to Bob Foster, WebGain
> +-->
> +
> +<!--
> +     This DTD is not conditional on any parameter entities in the internal
> +     subset and does not export any general entities.
> +-->
> +
> +<!--================== Constrained Names ====================================-->
> +
> +<!ENTITY % URI "CDATA">
> +    <!-- a Uniform Resource Identifier, see [RFC2396] -->
> +
> +<!ENTITY % UriList "CDATA">
> +    <!-- a space separated list of Uniform Resource Identifiers -->
> +
> +<!ENTITY % URL "CDATA">
> +    <!-- a relative urlSpec is as in Section 2.10.2. -->
> +
> +<!ENTITY % BeanID "IDREF">
> +    <!-- a previously declared bean ID in the current scope. -->
> +
> +<!ENTITY % Prefix "CDATA">
> +    <!-- a Name that contains no : characters. -->
> +
> +<!ENTITY % ClassName "CDATA">
> +    <!-- a fully qualified class name. -->
> +
> +<!ENTITY % TypeName "CDATA">
> +    <!-- a fully qualified class or interface name. -->
> +
> +<!ENTITY % BeanName "CDATA">
> +    <!-- a bean name as expected by java.beans.Beans instantiate(). -->
> +
> +<!ENTITY % Content "CDATA">
> +    <!-- a MIME type followed by an IANA charset, as " type [; S? ['charset='] charset] " -->
> +
> +<!ENTITY % Length "CDATA">
> +    <!-- nn for pixels or nn% for percentage length -->
> +
> +<!ENTITY % Pixels "CDATA">
> +    <!-- integer representing length in pixels -->
> +
> +<!ENTITY % Bool "(true|false|yes|no)">
> +    <!-- boolean -->
> +
> +<!-- used for object, applet, img, input and iframe -->
> +<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
> +
> +<!--=================== Element Groups ====================================-->
> +
> +<!ENTITY % Directives "jsp:directive.page|jsp:directive.include">
> +
> +<!ENTITY % Scripts "jsp:scriptlet|jsp:declaration|jsp:expression">
> +
> +<!ENTITY % Actions
> +    "jsp:useBean
> +    |jsp:setProperty
> +    |jsp:getProperty
> +    |jsp:include
> +    |jsp:forward
> +    |jsp:plugin"
> +>
> +
> +<!ENTITY % Body "(jsp:text|%Directives;|%Scripts;|%Actions;)*">
> +
> +
> +<!-- ============================ Elements ============================ -->
> +
> +<!--    Root element of a JSP page.
> +-->
> +<!ELEMENT jsp:root %Body;>
> +<!ATTLIST jsp:root
> +    xmlns:jsp       CDATA           "http://java.sun.com/JSP/Page"
> +    version         CDATA           #REQUIRED
> +>
> +
> +<!ELEMENT jsp:directive.page EMPTY>
> +<!ATTLIST jsp:directive.page
> +    language        CDATA           "java"
> +    extends         %ClassName;     #IMPLIED
> +    contentType     %Content;       "text/html; ISO-8859-1"
> +    import          CDATA           #IMPLIED
> +    session         %Bool;          "true"
> +    buffer          CDATA           "8kb"
> +    autoFlush       %Bool;          "true"
> +    isThreadSafe    %Bool;          "true"
> +    info            CDATA           #IMPLIED
> +    errorPage       %URL;           #IMPLIED
> +    isErrorPage     %Bool;          "false"
> +    pageEncoding    CDATA           #IMPLIED
> +    isELIgnored     %Bool;          #IMPLIED
> +>
> +
> +<!-- the jsp:directive.include only appears in JSP documents and does
> +     not appear in the XML views of JSP pages.
> +-->
> +
> +<!ELEMENT jsp:directive.include EMPTY>
> +<!ATTLIST jsp:directive.include
> +    file            %URI;           #REQUIRED
> +>
> +
> +<!ELEMENT jsp:scriptlet (#PCDATA)>
> +
> +<!ELEMENT jsp:declaration (#PCDATA)>
> +
> +<!ELEMENT jsp:expression (#PCDATA)>
> +
> +<!ELEMENT jsp:useBean %Body;>
> +<!ATTLIST jsp:useBean
> +    id              ID              #REQUIRED
> +    class           %ClassName;     #IMPLIED
> +    type            %TypeName;      #IMPLIED
> +    beanName        %BeanName;      #IMPLIED
> +    scope           (page
> +                    |session
> +                    |request
> +                    |application)   "page"
> +>
> +
> +<!ELEMENT jsp:setProperty EMPTY>
> +<!ATTLIST jsp:setProperty
> +    name            %BeanID;        #REQUIRED
> +    property        CDATA           #REQUIRED
> +    value           CDATA           #IMPLIED
> +    param           CDATA           #IMPLIED
> +>
> +
> +<!ELEMENT jsp:getProperty EMPTY>
> +<!ATTLIST jsp:getProperty
> +    name            %BeanID;        #REQUIRED
> +    property        CDATA           #REQUIRED
> +>
> +
> +<!ELEMENT jsp:include (jsp:param*)>
> +<!ATTLIST jsp:include
> +    flush           %Bool;          "false"
> +    page            %URL;           #REQUIRED
> +>
> +
> +<!ELEMENT jsp:forward (jsp:param*)>
> +<!ATTLIST jsp:forward
> +    page            %URL;           #REQUIRED
> +>
> +
> +<!ELEMENT jsp:plugin (jsp:params?, jsp:fallback?)>
> +<!ATTLIST jsp:plugin
> +    type            (bean|applet)   #REQUIRED
> +    code            %URI;           #IMPLIED
> +    codebase        %URI;           #IMPLIED
> +    align           %ImgAlign;      #IMPLIED
> +    archive         %UriList;       #IMPLIED
> +    height          %Length;        #IMPLIED
> +    hspace          %Pixels;        #IMPLIED
> +    jreversion      CDATA           "1.2"
> +    name            NMTOKEN         #IMPLIED
> +    vspace          %Pixels;        #IMPLIED
> +    width           %Length;        #IMPLIED
> +    nspluginurl     %URI;           #IMPLIED
> +    iepluginurl     %URI;           #IMPLIED
> +>
> +
> +<!ELEMENT jsp:params (jsp:param+)>
> +
> +<!ELEMENT jsp:param EMPTY>
> +<!ATTLIST jsp:param
> +    name            CDATA           #REQUIRED
> +    value           CDATA           #REQUIRED
> +>
> +
> +<!ELEMENT jsp:text #PCDATA>
> +
>
> Propchange: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd
> ------------------------------------------------------------------------------
>     svn:executable = *
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,514 @@
> +<?xml version ="1.0"?>
> +<!--
> + Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +<!DOCTYPE schema [
> +<!-- Patterns -->
> +<!ENTITY Identifier   "(\p{L}|_|$)(\p{N}|\p{L}|_|$)*">
> +<!ENTITY TypeName     "&Identifier;(\.&Identifier;)*">
> +<!ENTITY WS       "\s*">
> +<!ENTITY Import     "&TypeName;(\.\*)?">
> +<!ENTITY ImportList   "&Import;(&WS;,&WS;&Import;)*">
> +<!ENTITY SetProp    "(&Identifier;|\*)">
> +<!ENTITY RelativeURL  "[^:#/\?]*(:{0,0}|[#/\?].*)">
> +<!ENTITY Length     "[0-9]*&#x25;?">
> +<!ENTITY AsciiName    "[A-Za-z0-9_-]*">
> +<!ENTITY ValidContentType  "&AsciiName;/&AsciiName;(;&WS;(charset=)?&AsciiName;)?">
> +<!ENTITY ValidPageEncoding  "&AsciiName;/&AsciiName;">
> +<!ENTITY Buffer     "[0-9]+kb">
> +<!ENTITY RTexpr     "&#x25;=.*&#x25;">
> +]>
> +
> +
> +<!--Conforms to w3c http://www.w3.org/2001/XMLSchema -->
> +
> +<xsd:schema
> +    xmlns = "http://java.sun.com/JSP/Page"
> +    xmlns:xsd = "http://www.w3.org/2001/XMLSchema"
> +    xmlns:jsp = "http://java.sun.com/JSP/Page"
> +    targetNamespace = "http://java.sun.com/JSP/Page"
> +    elementFormDefault = "qualified"
> +    attributeFormDefault = "unqualified">
> +
> +  <xsd:annotation>
> +    <xsd:documentation>
> +      XML Schema for JSP 2.0.
> +
> +      This schema is based upon the recent (May 5th, 2001)
> +      W3C recommendation for XML Schema.
> +
> +      A JSP translator should reject an XML-format file that is
> +      not strictly valid according to this schema or does not observe
> +      the constraints documented here. A translator is not required
> +      to use this schema for validation or to use a validating parser.
> +    </xsd:documentation>
> +  </xsd:annotation>
> +
> +
> +  <!-- Complex Types -->
> +
> +  <xsd:complexType name = "Body">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Body defines the "top-level" elements in root and beanInfo.
> +        There are probably other elements that should use it.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:group ref = "Bodygroup" minOccurs = "0" maxOccurs = "unbounded"/>
> +  </xsd:complexType>
> +
> +  <!-- groups -->
> +
> +  <xsd:group name = "Bodygroup">
> +    <xsd:choice>
> +      <xsd:element ref = "directive.page"/>
> +      <xsd:element ref = "directive.include"/>
> +      <xsd:element ref = "scriptlet"/>
> +      <xsd:element ref = "declaration"/>
> +      <xsd:element ref = "expression"/>
> +      <xsd:element ref = "useBean"/>
> +      <xsd:element ref = "setProperty"/>
> +      <xsd:element ref = "getProperty"/>
> +      <xsd:element ref = "include"/>
> +      <xsd:element ref = "forward"/>
> +      <xsd:element ref = "plugin"/>
> +      <xsd:element ref = "text"/>
> +      <xsd:any namespace="##other" processContents = "lax"/>
> +    </xsd:choice>
> +  </xsd:group>
> +
> +
> +  <!-- Simple types are next -->
> +
> +  <xsd:simpleType name = "RTE">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        A request-time expression value
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&RTexpr;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "Bool">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Bool would be boolean except it does not accept 1 and 0.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:NMTOKEN" >
> +      <xsd:enumeration value = "true"/>
> +      <xsd:enumeration value = "false"/>
> +      <xsd:enumeration value = "yes"/>
> +      <xsd:enumeration value = "no"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "Identifier">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Identifier is an unqualified Java identifier.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&Identifier;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "TypeName">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        TypeName is one or more Java identifiers separated by dots
> +        with no whitespace.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&TypeName;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "ImportList">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        ImportList is one or more typeNames separated by commas.
> +        Whitespace is allowed before and after the comma.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&ImportList;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "SetProp">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        SetProp is an Identifier or *.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&SetProp;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "RelativeURL">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        RelativeURL is a uriReference with no colon character
> +        before the first /, ? or #, if any (RFC2396).
> +      </xsd:documentation>
> +    </xsd:annotation>
> +       <xsd:restriction base = "xsd:anyURI">
> +      <xsd:pattern value = "&RelativeURL;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "RTERelativeURL">
> +    <xsd:union memberTypes = "RelativeURL RTE"/>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "Length">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Length is nn or nn%.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&Length;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +
> +  <xsd:simpleType name = "ExplicitBufferSize">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +         Buffer Size with an explicit value
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&Buffer;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "NoneBufferSize">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +         Buffer Size with a "none" value
> +      </xsd:documentation>
> +    </xsd:annotation>
> +       <xsd:restriction base = "xsd:string">
> +         <xsd:enumeration value = "none"/>
> +       </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "BufferSize">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Buffer size is xkb or none.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:union memberTypes = "ExplicitBufferSize NoneBufferSize"/>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "ContentType">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Content type and character encoding for this page.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&ValidContentType;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "PageEncoding">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Page Encoding for this page.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:string">
> +      <xsd:pattern value = "&ValidPageEncoding;"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "Scope">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        valid scope values
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:NMTOKEN">
> +      <xsd:enumeration value = "page"/>
> +      <xsd:enumeration value = "session"/>
> +      <xsd:enumeration value = "request"/>
> +      <xsd:enumeration value = "application"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "PlugInType">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        valid values for a plugin type
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:NMTOKEN">
> +      <xsd:enumeration value = "bean"/>
> +      <xsd:enumeration value = "applet"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <xsd:simpleType name = "AlignType">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Buffer size is xkb.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:restriction base = "xsd:NMTOKEN">
> +      <xsd:enumeration value = "top"/>
> +      <xsd:enumeration value = "middle"/>
> +      <xsd:enumeration value = "bottom"/>
> +      <xsd:enumeration value = "left"/>
> +      <xsd:enumeration value = "right"/>
> +    </xsd:restriction>
> +  </xsd:simpleType>
> +
> +  <!-- Elements follow -->
> +
> +  <xsd:element name = "root">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        The root element of all JSP documents is named root.
> +
> +        Authors may, if they wish, include schema location information.
> +        If specified, the information may appear as attributes of
> +        the root element as follows:
> +
> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> +        xsi:schemaLocation="http://java.sun.com/JSP/Page xsd-file-location"
> +
> +        Documents should not specify the system identifier of a DTD
> +        in a DOCTYPE declaration.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:complexType>
> +      <xsd:complexContent>
> +        <xsd:extension base = "Body">
> +          <xsd:attribute name = "version" fixed = "2.0" type = "xsd:string"/>
> +        </xsd:extension>
> +      </xsd:complexContent>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "directive.page">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        directive.page is the "page directive".
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:complexType>
> +      <xsd:attribute name = "language" default = "java" type = "xsd:string"/>
> +      <xsd:attribute name = "extends" type = "TypeName"/>
> +      <xsd:attribute name = "contentType" default = "text/html; ISO-8859-1" type = "ContentType"/>
> +      <xsd:attribute name = "pageEncoding" use = "optional" type = "PageEncoding"/>
> +      <xsd:attribute name = "import" type = "ImportList"/>
> +      <xsd:attribute name = "session" default = "true" type = "Bool"/>
> +      <xsd:attribute name = "buffer" default = "8kb" type = "BufferSize"/>
> +      <xsd:attribute name = "autoFlush" default = "true" type = "Bool"/>
> +      <xsd:attribute name = "isThreadSafe" default = "true" type = "Bool"/>
> +      <xsd:attribute name = "info" type = "xsd:string"/>
> +      <xsd:attribute name = "errorPage" type = "RelativeURL"/>
> +      <xsd:attribute name = "isErrorPage" default = "false" type = "Bool"/>
> +      <xsd:attribute name = "isELIgnored" type = "Bool"/>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "directive.include">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        directive.include is the "include directive".
> +       This element does not appear on XML views of JSP pages.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:complexType>
> +      <xsd:attribute name = "file" use = "required" type = "RelativeURL"/>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "scriptlet" type = "xsd:string">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        The representation of a scriplet.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +  </xsd:element>
> +
> +  <xsd:element name = "declaration" type = "xsd:string">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        The reprsentation of a declaration.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +  </xsd:element>
> +
> +  <xsd:element name = "expression" type = "xsd:string">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        The representation of an expression.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +  </xsd:element>
> +
> +  <xsd:element name = "text" type = "xsd:string">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        Verbatim template text.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +  </xsd:element>
> +
> +  <xsd:element name = "useBean">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        useBean instantiates or accesses a bean in the specified scope.
> +
> +        Constraint: The allowed combinations of attributes are:
> +
> +          class [type] | type [( class | beanName)]
> +
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:complexType>
> +      <xsd:complexContent>
> +        <xsd:extension base="Body">
> +          <xsd:attribute name = "id" use = "required" type = "Identifier"/>
> +          <xsd:attribute name = "class" type = "TypeName"/>
> +          <xsd:attribute name = "type" type = "TypeName"/>
> +          <xsd:attribute name = "beanName" type = "TypeName"/>
> +          <xsd:attribute name = "scope" default = "page" type = "Scope"/>
> +        </xsd:extension>
> +      </xsd:complexContent>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "setProperty">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        setProperty changes the value of an object property.
> +
> +        Constraint: The object named by the name must have been
> +        "introduced" to the JSP processor using either the
> +        jsp:useBean action or a custom action with an associated
> +        VariableInfo entry for this name.
> +
> +        Exact valid combinations are not expressable in XML Schema.
> +        They are:
> +
> +        name="Identifier" property="*"
> +        name="Identifier" property="Identfiier" param="string"
> +        name="Identifier" property="Identifier" value="string"
> +
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:complexType>
> +      <xsd:attribute name = "name" use = "required" type = "Identifier"/>
> +      <xsd:attribute name = "property" use = "required" type = "SetProp"/>
> +      <xsd:attribute name = "param" type = "xsd:string"/>
> +      <xsd:attribute name = "value" type = "xsd:string"/>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "getProperty">
> +    <xsd:annotation>
> +      <xsd:documentation>
> +        getProperty obtains the value of an object property.
> +
> +        Constraint: The object named by the name must have been
> +        "introduced" to the JSP processor using either the
> +        jsp:useBean action or a custom action with an associated
> +        VariableInfo entry for this name.
> +
> +        ???The spec is interpreted as restricting the values of
> +        property to Identifier.
> +      </xsd:documentation>
> +    </xsd:annotation>
> +    <xsd:complexType>
> +      <xsd:attribute name = "name" use = "required" type = "Identifier"/>
> +      <xsd:attribute name = "property" use = "required" type = "Identifier"/>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "include">
> +    <xsd:complexType>
> +      <xsd:sequence>
> +        <xsd:element ref = "param" minOccurs = "0" maxOccurs = "unbounded"/>
> +      </xsd:sequence>
> +      <xsd:attribute name = "flush" default = "false" type = "Bool"/>
> +      <xsd:attribute name = "page" use = "required" type = "RTERelativeURL"/>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "forward">
> +    <xsd:complexType>
> +      <xsd:sequence>
> +        <xsd:element ref = "param" minOccurs = "0" maxOccurs = "unbounded"/>
> +      </xsd:sequence>
> +      <xsd:attribute name = "page" use = "required" type = "RTERelativeURL"/>
> +     </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "plugin">
> +    <xsd:complexType> <!-- content only! -->
> +      <xsd:sequence>
> +        <xsd:element ref = "params" minOccurs = "0" maxOccurs = "1"/>
> +        <xsd:element name = "fallback" minOccurs = "0" maxOccurs = "1" type = "Body"/>
> +      </xsd:sequence>
> +      <xsd:attribute name = "type" use = "required" type = "PlugInType"/>
> +      <xsd:attribute name = "code" type = "xsd:anyURI"/>
> +      <xsd:attribute name = "codebase" type = "xsd:anyURI"/>
> +      <xsd:attribute name = "align" type = "AlignType"/>
> +      <xsd:attribute name = "archive">
> +        <xsd:simpleType>
> +           <xsd:list itemType="xsd:anyURI"/>
> +        </xsd:simpleType>
> +      </xsd:attribute>
> +      <xsd:attribute name = "height" type = "Length"/>
> +      <xsd:attribute name = "hspace" type = "xsd:int"/>
> +      <xsd:attribute name = "jreversion" default = "1.2" type = "xsd:string"/>
> +      <xsd:attribute name = "name" type = "xsd:NMTOKEN"/>
> +      <xsd:attribute name = "vspace" type = "xsd:int"/>
> +      <xsd:attribute name = "width" type = "Length"/>
> +      <xsd:attribute name = "nspluginurl" type = "xsd:anyURI"/>
> +      <xsd:attribute name = "iepluginurl" type = "xsd:anyURI"/>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "params">
> +    <xsd:complexType>
> +       <xsd:sequence>
> +         <xsd:element ref = "param" minOccurs = "1" maxOccurs = "unbounded"/>
> +       </xsd:sequence>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +  <xsd:element name = "param">
> +    <xsd:complexType>
> +      <xsd:attribute name = "name" use = "required" type = "xsd:NMTOKEN"/>
> +      <xsd:attribute name = "value" use = "required" type = "xsd:string"/>
> +    </xsd:complexType>
> +  </xsd:element>
> +
> +</xsd:schema>
>
> Propchange: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd
> ------------------------------------------------------------------------------
>     svn:executable = *
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,207 @@
> +<!--
> + Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +<!--
> +
> +   This is the DTD defining the JavaServer Pages 1.1 Tag Library
> +   descriptor (.tld) (XML) file format/syntax.
> +
> +   A Tag Library is a JAR file containing a valid instance of a Tag Library
> +   Descriptor (taglib.tld) file in the META-INF subdirectory, along with the
> +   appropriate implementing classes, and other resources required to
> +   implement the tags defined therein.
> +
> +   Use is subject to license terms.
> +  -->
> +
> +<!--
> +The taglib tag is the document root, it defines:
> +
> +tlibversion    the version of the tag library implementation
> +jspversion     the version of JSP the tag library depends upon
> +
> +shortname      a simple default short name that could be used by
> +               a JSP authoring tool to create names with a mnemonic
> +               value; for example, the it may be used as the prefered
> +               prefix value in taglib directives
> +uri            a uri uniquely identifying this taglib
> +info           a simple string describing the "use" of this taglib,
> +               should be user discernable
> +-->
> +
> +<!ELEMENT taglib (tlibversion, jspversion?, shortname, uri?, info?, tag+) >
> +<!ATTLIST taglib id ID #IMPLIED
> +         xmlns CDATA #FIXED
> +               "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"
> +>
> +
> +<!--
> +Describes this version (number) of the taglibrary (dewey decimal)
> +
> +#PCDATA ::= [0-9]*{ "."[0-9] }0..3
> +-->
> +
> +<!ELEMENT tlibversion (#PCDATA) >
> +
> +<!--
> +Describes the JSP version (number) this taglibrary requires in
> +order to function (dewey decimal)
> +
> +The default is 1.1
> +
> +#PCDATA ::= [0-9]*{ "."[0-9] }0..3
> +-->
> +
> +<!ELEMENT jspversion  (#PCDATA) >
> +
> +<!--
> +Defines a short (default) shortname to be used for tags and
> +variable names used/created by this tag library.  Do not use
> +white space, and do not start with digits or underscore.
> +
> +#PCDATA ::= NMTOKEN
> +-->
> +
> +<!ELEMENT shortname      (#PCDATA) >
> +
> +<!--
> +Defines a public URI that uniquely identifies this version of
> +the taglibrary Leave it empty if it does not apply.
> +-->
> +
> +<!ELEMENT uri   (#PCDATA) >
> +
> +<!--
> +Defines an arbitrary text string descirbing the tag library
> +-->
> +
> +<!ELEMENT info (#PCDATA) >
> +
> +<!--
> +The tag defines a unique tag in this tag library, defining:
> +
> +- the unique tag/element name
> +- the subclass of javax.servlet.jsp.tagext.Tag implementation class
> +- an optional subclass of javax.servlet.jsp.tagext.TagExtraInfo
> +- the body content type (hint)
> +- optional tag-specific information
> +- any attributes
> +-->
> +
> +<!ELEMENT tag (name, tagclass, teiclass?, bodycontent?, info?, attribute*) >
> +
> +<!--
> +Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
> +the request time semantics for this tag. (required)
> +
> +#PCDATA ::= fully qualified Java class name
> +-->
> +
> +<!ELEMENT tagclass (#PCDATA) >
> +
> +<!--
> +Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo for
> +this tag. (optional)
> +
> +If this is not given, the class is not consulted at translation time.
> +
> +#PCDATA ::= fully qualified Java class name
> +-->
> +
> +<!ELEMENT teiclass (#PCDATA) >
> +
> +<!--
> +Provides a hint as to the content of the body of this tag. Primarily
> +intended for use by page composition tools.
> +
> +There are currently three values specified:
> +
> +tagdependent   The body of the tag is interpreted by the tag
> +               implementation itself, and is most likely in a
> +               different "langage", e.g embedded SQL statements.
> +
> +JSP            The body of the tag contains nested JSP syntax
> +
> +empty          The body must be empty
> +
> +The default (if not defined) is JSP
> +
> +#PCDATA ::=  tagdependent | JSP | empty
> +
> +-->
> +
> +<!ELEMENT bodycontent (#PCDATA) >
> +
> +<!--
> +The attribute tag defines an attribute for the nesting tag
> +
> +An attribute definition is composed of:
> +
> +- the attributes name (required)
> +- if the attribute is required or optional (optional)
> +- if the attributes value may be dynamically calculated at runtime
> +  by a scriptlet expression (optional)
> +
> +-->
> +
> +<!ELEMENT attribute (name, required? , rtexprvalue?) >
> +
> +<!--
> +Defines the canonical name of a tag or attribute being defined
> +
> +#PCDATA ::= NMTOKEN
> +-->
> +
> +<!ELEMENT name (#PCDATA) >
> +
> +<!--
> +Defines if the nesting attribute is required or optional.
> +
> +#PCDATA ::= true | false | yes | no
> +
> +If not present then the default is "false", i.e the attribute
> +is optional.
> +-->
> +
> +<!ELEMENT required    (#PCDATA) >
> +
> +<!--
> +Defines if the nesting attribute can have scriptlet expressions as
> +a value, i.e the value of the attribute may be dynamically calculated
> +at request time, as opposed to a static value determined at translation
> +time.
> +
> +#PCDATA ::= true | false | yes | no
> +
> +If not present then the default is "false", i.e the attribute
> +has a static value
> +-->
> +
> +<!ELEMENT rtexprvalue (#PCDATA) >
> +
> +<!ATTLIST tlibversion id ID #IMPLIED>
> +<!ATTLIST jspversion id ID #IMPLIED>
> +<!ATTLIST shortname id ID #IMPLIED>
> +<!ATTLIST uri id ID #IMPLIED>
> +<!ATTLIST info id ID #IMPLIED>
> +<!ATTLIST tag id ID #IMPLIED>
> +<!ATTLIST tagclass id ID #IMPLIED>
> +<!ATTLIST teiclass id ID #IMPLIED>
> +<!ATTLIST bodycontent id ID #IMPLIED>
> +<!ATTLIST attribute id ID #IMPLIED>
> +<!ATTLIST name id ID #IMPLIED>
> +<!ATTLIST required id ID #IMPLIED>
> +<!ATTLIST rtexprvalue id ID #IMPLIED>
>
> Propchange: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd
> ------------------------------------------------------------------------------
>     svn:executable = *
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,478 @@
> +<!--
> + Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +<!--
> +
> +   This is the DTD defining the JavaServer Pages 1.2 Tag Library
> +   descriptor (.tld) (XML) file format/syntax.
> +
> +   A Tag Library is a JAR file containing a valid instance of a Tag Library
> +   Descriptor (taglib.tld) file in the META-INF subdirectory, along with the
> +   appropriate implementing classes, and other resources required to
> +   implement the tags defined therein.
> +
> +   Use is subject to license terms.
> +  -->
> +
> +<!NOTATION WEB-JSPTAGLIB.1_2 PUBLIC
> +          "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN">
> +
> +<!--
> +This is the XML DTD for the JSP 1.2 Tag Library Descriptor.
> +All JSP 1.2 tag library descriptors must include a DOCTYPE
> +of the following form:
> +
> +  <!DOCTYPE taglib
> +        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
> +       "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
> +
> +-->
> +
> +<!--
> +The taglib tag is the document root, it defines:
> +
> +tlib-version   the version of the tag library implementation
> +
> +jsp-version    the version of JSP the tag library depends upon
> +
> +short-name     a simple default short name that could be used by
> +               a JSP authoring tool to create names with a mnemonic
> +               value; for example, the it may be used as the prefered
> +               prefix value in taglib directives
> +
> +uri            a uri uniquely identifying this taglib
> +
> +display-name    the display-name element contains a short name that
> +                is intended to be displayed by tools
> +small-icon      optional small-icon that can be used by tools
> +
> +large-icon      optional large-icon that can be used by tools
> +
> +description    a simple string describing the "use" of this taglib,
> +               should be user discernable
> +
> +validator       optional TagLibraryValidator information
> +
> +listener        optional event listener specification
> +
> +
> +-->
> +
> +<!ELEMENT taglib (tlib-version, jsp-version, short-name, uri?,
> +                  display-name?, small-icon?, large-icon?, description?,
> +                  validator?, listener*, tag+) >
> +
> +<!ATTLIST taglib id ID #IMPLIED
> +         xmlns CDATA #FIXED
> +               "http://java.sun.com/JSP/TagLibraryDescriptor"
> +>
> +
> +<!--
> +Describes this version (number) of the taglibrary (dewey decimal)
> +
> +#PCDATA ::= [0-9]*{ "."[0-9] }0..3
> +-->
> +
> +<!ELEMENT tlib-version (#PCDATA) >
> +
> +<!--
> +Describes the JSP version (number) this taglibrary requires in
> +order to function (dewey decimal)
> +
> +The default is 1.2
> +
> +#PCDATA ::= [0-9]*{ "."[0-9] }0..3
> +-->
> +
> +<!ELEMENT jsp-version  (#PCDATA) >
> +
> +<!--
> +Defines a short (default) short-name to be used for tags and
> +variable names used/created by this tag library.  Do not use
> +white space, and do not start with digits or underscore.
> +
> +#PCDATA ::= NMTOKEN
> +-->
> +
> +<!ELEMENT short-name      (#PCDATA) >
> +
> +<!--
> +Defines a public URI that uniquely identifies this version of
> +the taglibrary.  Leave it empty if it does not apply.
> +-->
> +
> +<!ELEMENT uri   (#PCDATA) >
> +
> +<!--
> +Defines an arbitrary text string descirbing the tag library
> +-->
> +
> +<!ELEMENT description  (#PCDATA) >
> +
> +<!--
> +
> +Defines an optional validator that can be used to
> +validate the conformance of a JSP page to using this tag library.
> +-->
> +
> +<!ELEMENT validator (validator-class, init-param*, description?) >
> +
> +
> +<!--
> +
> +Defines the TagLibraryValidator class that can be used to
> +validate the conformance of a JSP page to using this tag library.
> +-->
> +
> +<!ELEMENT validator-class (#PCDATA) >
> +
> +
> +<!--
> +
> +The init-param element contains a name/value pair as an
> +initialization param
> +-->
> +
> +<!ELEMENT init-param (param-name, param-value, description?)>
> +
> +<!--
> +
> +The param-name element contains the name of a parameter.
> +-->
> +
> +<!ELEMENT param-name (#PCDATA)>
> +
> +<!--
> +
> +The param-value element contains the value of a parameter.
> +-->
> +
> +<!ELEMENT param-value (#PCDATA)>
> +
> +
> +<!--
> +
> +Defines an optional event listener object to be instantiated and
> +registered automatically.
> +-->
> +
> +<!ELEMENT listener (listener-class) >
> +
> +<!--
> +
> +The listener-class element declares a class in the application that
> +must be registered as a web application listener bean.  See the
> +Servlet 2.3 specification for details.
> +-->
> +
> +<!ELEMENT listener-class (#PCDATA) >
> +
> +
> +<!--
> +The tag defines a unique tag in this tag library.  It has one
> +attribute, id.
> +
> +The tag element may have several subelements defining:
> +
> +name              The unique action name
> +
> +tag-class         The tag handler class implementing
> +                  javax.servlet.jsp.tagext.Tag
> +
> +tei-class         An optional subclass of
> +                  javax.servlet.jsp.tagext.TagExtraInfo
> +
> +body-content      The body content type
> +
> +display-name      A short name that is intended to be displayed
> +                  by tools
> +
> +small-icon        Optional small-icon that can be used by tools
> +
> +large-icon        Optional large-icon that can be used by tools
> +
> +description       Optional tag-specific information
> +
> +variable          Optional scripting variable information
> +
> +attribute         All attributes of this action
> +
> +example           Optional informal description of an example of a
> +                  use of this tag
> +
> +-->
> +
> +<!ELEMENT tag (name, tag-class, tei-class?, body-content?, display-name?,
> +               small-icon?, large-icon?, description?, variable*, attribute*,
> +               example?) >
> +
> +<!--
> +Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
> +the request time semantics for this tag. (required)
> +
> +#PCDATA ::= fully qualified Java class name
> +-->
> +
> +<!ELEMENT tag-class (#PCDATA) >
> +
> +<!--
> +Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo for
> +this tag. (optional)
> +
> +If this is not given, the class is not consulted at translation time.
> +
> +#PCDATA ::= fully qualified Java class name
> +-->
> +
> +<!ELEMENT tei-class (#PCDATA) >
> +
> +<!--
> +Provides a hint as to the content of the body of this tag. Primarily
> +intended for use by page composition tools.
> +
> +There are currently three values specified:
> +
> +tagdependent   The body of the tag is interpreted by the tag
> +               implementation itself, and is most likely in a
> +               different "langage", e.g embedded SQL statements.
> +
> +JSP            The body of the tag contains nested JSP syntax
> +
> +empty          The body must be empty
> +
> +The default (if not defined) is JSP
> +
> +#PCDATA ::=  tagdependent | JSP | empty
> +
> +-->
> +
> +<!ELEMENT body-content (#PCDATA) >
> +
> +<!--
> +
> +The display-name element contains a short name that is intended
> +to be displayed by tools.
> +-->
> +
> +<!ELEMENT display-name (#PCDATA) >
> +
> +
> +<!--
> +
> +The large-icon element contains the name of a file containing a large
> +(32 x 32) icon image.  The file name is a relative path within the
> +tag library.  The image must be either in the JPEG or GIF format, and
> +the file name must end with the suffix ".jpg" or ".gif" respectively.
> +The icon can be used by tools.
> +-->
> +
> +<!ELEMENT large-icon (#PCDATA) >
> +
> +<!--
> +
> +The small-icon element contains the name of a file containing a large
> +(32 x 32) icon image.  The file name is a relative path within the
> +tag library.  The image must be either in the JPEG or GIF format, and
> +the file name must end with the suffix ".jpg" or ".gif" respectively.
> +The icon can be used by tools.
> +-->
> +
> +<!ELEMENT small-icon (#PCDATA) >
> +
> +<!--
> +
> +The example element contains an informal description of an example
> +of the use of a tag.
> +-->
> +
> +<!ELEMENT example (#PCDATA) >
> +
> +<!--
> +
> +The variable tag provides information on the scripting variables
> +defined by this tag.  It is a (translation time) error for a tag
> +that has one or more variable subelements to have a TagExtraInfo
> +class that returns a non-null object.
> +
> +The subelements of variable are of the form:
> +
> +name-given               The variable name as a constant
> +
> +name-from-attribute      The name of an attribute whose (translation
> +                         time) value will give the name of the
> +                         variable.  One of name-given or
> +                         name-from-attribute is required.
> +
> +variable-class           Name of the class of the variable.
> +                         java.lang.String is default.
> +
> +declare                  Whether the variable is declared or not.
> +                         True is the default.
> +
> +scope                    The scope of the scripting varaible
> +                         defined.  NESTED is default.
> +
> +description              Optional description of this variable
> +
> +-->
> +
> +<!ELEMENT variable ( (name-given | name-from-attribute), variable-class?,
> +                    declare?, scope?, description?) >
> +
> +<!--
> +
> +The name for the scripting variable.  One of name-given or
> +name-from-attribute is required.
> +-->
> +
> +<!ELEMENT name-given (#PCDATA) >
> +
> +<!--
> +
> +The name of an attribute whose (translation-time) value will give
> +the name of the variable.  One of name-given or name-from-attribute
> +is required.
> +-->
> +
> +<!ELEMENT name-from-attribute (#PCDATA) >
> +
> +<!--
> +
> +The optional name of the class for the scripting variable.  The
> +default is java.lang.String.
> +-->
> +
> +<!ELEMENT variable-class (#PCDATA) >
> +
> +<!--
> +
> +Whether the scripting variable is to be defined or not.  See
> +TagExtraInfo for details.  This element is optional and "true"
> +is the default.
> +-->
> +
> +<!ELEMENT declare (#PCDATA) >
> +
> +<!--
> +
> +The scope of the scripting variable.  See TagExtraInfo for details.
> +The element is optional and "NESTED" is the default.  Other legal
> +values are "AT_BEGIN" and "AT_END".
> +-->
> +
> +<!ELEMENT scope (#PCDATA) >
> +
> +<!--
> +
> +The attribute tag defines an attribute for the nesting tag
> +
> +An attribute definition is composed of:
> +
> +- the attributes name (required)
> +- if the attribute is required or optional (optional)
> +- if the attributes value may be dynamically calculated at runtime
> +  by a scriptlet expression (optional)
> +- the type of the attributes value (optional)
> +- an informal description of the meaning of the attribute (optional)
> +
> +-->
> +
> +
> +<!--
> +The attribute tag defines an attribute for the nesting tag
> +
> +An attribute definition is composed of:
> +
> +- the attributes name (required)
> +
> +- if the attribute is required or optional (optional)
> +
> +- if the attributes value may be dynamically calculated at runtime
> +  by a scriptlet expression (optional)
> +
> +- the type of the attributes value (optional)
> +
> +- an informal description of the meaning of the attribute (optional)
> +-->
> +
> +<!ELEMENT attribute (name, required? , rtexprvalue?, type?, description?) >
> +
> +<!--
> +Defines the canonical name of a tag or attribute being defined
> +
> +#PCDATA ::= NMTOKEN
> +-->
> +
> +<!ELEMENT name (#PCDATA) >
> +
> +<!--
> +Defines if the nesting attribute is required or optional.
> +
> +#PCDATA ::= true | false | yes | no
> +
> +If not present then the default is "false", i.e the attribute
> +is optional.
> +-->
> +
> +<!ELEMENT required    (#PCDATA) >
> +
> +<!--
> +Defines if the nesting attribute can have scriptlet expressions as
> +a value, i.e the value of the attribute may be dynamically calculated
> +at request time, as opposed to a static value determined at translation
> +time.
> +
> +#PCDATA ::= true | false | yes | no
> +
> +If not present then the default is "false", i.e the attribute
> +has a static value
> +-->
> +
> +<!ELEMENT rtexprvalue (#PCDATA) >
> +
> +
> +<!--
> +
> +Defines the Java type of the attributes value.  For static values
> +(those determined at translation time) the type is always
> +java.lang.String.
> +-->
> +
> +<!ELEMENT type (#PCDATA) >
> +
> +
> +<!-- ID attributes -->
> +
> +<!ATTLIST tlib-version id ID #IMPLIED>
> +<!ATTLIST jsp-version id ID #IMPLIED>
> +<!ATTLIST short-name id ID #IMPLIED>
> +<!ATTLIST uri id ID #IMPLIED>
> +<!ATTLIST description id ID #IMPLIED>
> +<!ATTLIST example id ID #IMPLIED>
> +<!ATTLIST tag id ID #IMPLIED>
> +<!ATTLIST tag-class id ID #IMPLIED>
> +<!ATTLIST tei-class id ID #IMPLIED>
> +<!ATTLIST body-content id ID #IMPLIED>
> +<!ATTLIST attribute id ID #IMPLIED>
> +<!ATTLIST name id ID #IMPLIED>
> +<!ATTLIST required id ID #IMPLIED>
> +<!ATTLIST rtexprvalue id ID #IMPLIED>
> +
> +
> +<!ATTLIST param-name id ID #IMPLIED>
> +<!ATTLIST param-value id ID #IMPLIED>
> +<!ATTLIST listener id ID #IMPLIED>
> +<!ATTLIST listener-class id ID #IMPLIED>
>
> Propchange: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd
> ------------------------------------------------------------------------------
>     svn:executable = *
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,181 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +
> +<!--
> +  Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +
> +<!--
> +  **  The actual Sun XSD for this stripped down XSD can be found at
> +  **  http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
> +  **  This XSD contains only the functional elements for programatic use.
> +-->
> +
> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/j2ee"
> +            xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
> +            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> +            elementFormDefault="qualified"
> +            attributeFormDefault="unqualified"
> +            version="2.0">
> +
> +    <xsd:include schemaLocation="j2ee_1_4.xsd" />
> +
> +    <xsd:element name="taglib" type="j2ee:tldTaglibType">
> +        <xsd:unique name="tag-name-uniqueness">
> +            <xsd:selector xpath="j2ee:tag|j2ee:tag-file" />
> +            <xsd:field xpath="j2ee:name" />
> +        </xsd:unique>
> +        <xsd:unique name="function-name-uniqueness">
> +            <xsd:selector xpath="j2ee:function" />
> +            <xsd:field xpath="j2ee:name" />
> +        </xsd:unique>
> +    </xsd:element>
> +
> +    <xsd:complexType name="body-contentType">
> +        <xsd:simpleContent>
> +            <xsd:restriction base="j2ee:string">
> +                <xsd:enumeration value="tagdependent" />
> +                <xsd:enumeration value="JSP" />
> +                <xsd:enumeration value="empty" />
> +                <xsd:enumeration value="scriptless" />
> +            </xsd:restriction>
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="extensibleType" abstract="true">
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="functionType">
> +        <xsd:sequence>
> +            <xsd:group ref="j2ee:descriptionGroup" />
> +            <xsd:element name="name" type="j2ee:tld-canonical-nameType"></xsd:element>
> +            <xsd:element name="function-class" type="j2ee:fully-qualified-classType"></xsd:element>
> +            <xsd:element name="function-signature" type="j2ee:string"></xsd:element>
> +            <xsd:element name="example" type="j2ee:xsdStringType" minOccurs="0"></xsd:element>
> +            <xsd:element name="function-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tagFileType">
> +        <xsd:sequence>
> +            <xsd:group ref="j2ee:descriptionGroup" />
> +            <xsd:element name="name" type="j2ee:tld-canonical-nameType" />
> +            <xsd:element name="path" type="j2ee:pathType" />
> +            <xsd:element name="example" type="j2ee:xsdStringType" minOccurs="0"></xsd:element>
> +            <xsd:element name="tag-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tagType">
> +        <xsd:sequence>
> +            <xsd:group ref="j2ee:descriptionGroup" />
> +            <xsd:element name="name" type="j2ee:tld-canonical-nameType" />
> +            <xsd:element name="tag-class" type="j2ee:fully-qualified-classType"></xsd:element>
> +            <xsd:element name="tei-class" type="j2ee:fully-qualified-classType" minOccurs="0"></xsd:element>
> +            <xsd:element name="body-content" type="j2ee:body-contentType"></xsd:element>
> +            <xsd:element name="variable" type="j2ee:variableType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="attribute" type="j2ee:tld-attributeType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="dynamic-attributes" type="j2ee:generic-booleanType" minOccurs="0" />
> +            <xsd:element name="example" type="j2ee:xsdStringType" minOccurs="0"></xsd:element>
> +            <xsd:element name="tag-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-attributeType">
> +        <xsd:sequence>
> +            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="name" type="j2ee:java-identifierType" />
> +            <xsd:element name="required" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
> +            <xsd:choice>
> +                <xsd:sequence>
> +                    <xsd:element name="rtexprvalue" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
> +                    <xsd:element name="type" type="j2ee:fully-qualified-classType" minOccurs="0"></xsd:element>
> +                </xsd:sequence>
> +                <xsd:element name="fragment" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
> +            </xsd:choice>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-canonical-nameType">
> +        <xsd:simpleContent>
> +            <xsd:restriction base="j2ee:xsdNMTOKENType" />
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-extensionType">
> +        <xsd:sequence>
> +            <xsd:element name="extension-element" type="j2ee:extensibleType" maxOccurs="unbounded" />
> +        </xsd:sequence>
> +        <xsd:attribute name="namespace" use="required" type="xsd:anyURI" />
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tldTaglibType">
> +        <xsd:sequence>
> +            <xsd:group ref="j2ee:descriptionGroup" />
> +            <xsd:element name="tlib-version" type="j2ee:dewey-versionType"></xsd:element>
> +            <xsd:element name="short-name" type="j2ee:tld-canonical-nameType"></xsd:element>
> +            <xsd:element name="uri" type="j2ee:xsdAnyURIType" minOccurs="0"></xsd:element>
> +            <xsd:element name="validator" type="j2ee:validatorType" minOccurs="0"></xsd:element>
> +            <xsd:element name="listener" type="j2ee:listenerType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +            <xsd:element name="tag" type="j2ee:tagType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="tag-file" type="j2ee:tagFileType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="function" type="j2ee:functionType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="taglib-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="version" type="j2ee:dewey-versionType" fixed="2.0" use="required"></xsd:attribute>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="validatorType">
> +        <xsd:sequence>
> +            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="validator-class" type="j2ee:fully-qualified-classType"></xsd:element>
> +            <xsd:element name="init-param" type="j2ee:param-valueType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="variable-scopeType">
> +        <xsd:simpleContent>
> +
> +            <xsd:restriction base="j2ee:string">
> +                <xsd:enumeration value="NESTED" />
> +                <xsd:enumeration value="AT_BEGIN" />
> +                <xsd:enumeration value="AT_END" />
> +            </xsd:restriction>
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="variableType">
> +        <xsd:sequence>
> +            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:choice>
> +                <xsd:element name="name-given" type="j2ee:java-identifierType"></xsd:element>
> +                <xsd:element name="name-from-attribute" type="j2ee:java-identifierType"></xsd:element>
> +            </xsd:choice>
> +            <xsd:element name="variable-class" type="j2ee:fully-qualified-classType" minOccurs="0"></xsd:element>
> +
> +            <xsd:element name="declare" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
> +            <xsd:element name="scope" type="j2ee:variable-scopeType" minOccurs="0"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +</xsd:schema>
>
> Propchange: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
> ------------------------------------------------------------------------------
>     svn:executable = *
>
> Added: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd?rev=601048&view=auto
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd (added)
> +++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd Tue Dec  4 11:25:44 2007
> @@ -0,0 +1,229 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +
> +<!--
> +  Licensed to the Apache Software Foundation (ASF) under one or more
> +  contributor license agreements.  See the NOTICE file distributed with
> +  this work for additional information regarding copyright ownership.
> +  The ASF licenses this file to You under the Apache License, Version 2.0
> +  (the "License"); you may not use this file except in compliance with
> +  the License.  You may obtain a copy of the License at
> +
> +      http://www.apache.org/licenses/LICENSE-2.0
> +
> +  Unless required by applicable law or agreed to in writing, software
> +  distributed under the License is distributed on an "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +  See the License for the specific language governing permissions and
> +  limitations under the License.
> +-->
> +
> +<!--
> +  ** This XSD contains only the programatic elements required for an implementation.
> +  ** For the XSD from Sun that includes documentation and other copyrighted information
> +  ** please refer to http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd for a fully documented and latest
> +  **  XSD.
> +-->
> +
> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/javaee"
> +            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
> +            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> +            elementFormDefault="qualified"
> +            attributeFormDefault="unqualified"
> +            version="2.1">
> +
> +    <xsd:include schemaLocation="javaee_5.xsd" />
> +
> +    <xsd:element name="taglib" type="javaee:tldTaglibType">
> +        <xsd:unique name="tag-name-uniqueness">
> +            <xsd:selector xpath="javaee:tag|javaee:tag-file" />
> +            <xsd:field xpath="javaee:name" />
> +        </xsd:unique>
> +
> +        <xsd:unique name="function-name-uniqueness">
> +            <xsd:selector xpath="javaee:function" />
> +            <xsd:field xpath="javaee:name" />
> +        </xsd:unique>
> +    </xsd:element>
> +
> +    <xsd:complexType name="body-contentType">
> +        <xsd:simpleContent>
> +            <xsd:restriction base="javaee:string">
> +                <xsd:enumeration value="tagdependent" />
> +                <xsd:enumeration value="JSP" />
> +                <xsd:enumeration value="empty" />
> +                <xsd:enumeration value="scriptless" />
> +            </xsd:restriction>
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="extensibleType" abstract="true">
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="functionType">
> +        <xsd:sequence>
> +            <xsd:group ref="javaee:descriptionGroup" />
> +            <xsd:element name="name" type="javaee:tld-canonical-nameType"></xsd:element>
> +            <xsd:element name="function-class" type="javaee:fully-qualified-classType"></xsd:element>
> +            <xsd:element name="function-signature" type="javaee:string"></xsd:element>
> +            <xsd:element name="example" type="javaee:xsdStringType" minOccurs="0"></xsd:element>
> +            <xsd:element name="function-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tagFileType">
> +        <xsd:sequence>
> +            <xsd:group ref="javaee:descriptionGroup" />
> +            <xsd:element name="name" type="javaee:tld-canonical-nameType" />
> +            <xsd:element name="path" type="javaee:pathType" />
> +            <xsd:element name="example" type="javaee:xsdStringType" minOccurs="0"></xsd:element>
> +            <xsd:element name="tag-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tagType">
> +        <xsd:sequence>
> +            <xsd:group ref="javaee:descriptionGroup" />
> +            <xsd:element name="name" type="javaee:tld-canonical-nameType" />
> +            <xsd:element name="tag-class" type="javaee:fully-qualified-classType"></xsd:element>
> +            <xsd:element name="tei-class" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
> +            <xsd:element name="body-content" type="javaee:body-contentType"></xsd:element>
> +            <xsd:element name="variable" type="javaee:variableType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="attribute" type="javaee:tld-attributeType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="dynamic-attributes" type="javaee:generic-booleanType" minOccurs="0" />
> +            <xsd:element name="example" type="javaee:xsdStringType" minOccurs="0" />
> +            <xsd:element name="tag-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded" />
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-attributeType">
> +        <xsd:sequence>
> +            <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
> +
> +            <xsd:element name="name" type="javaee:java-identifierType" />
> +            <xsd:element name="required" type="javaee:generic-booleanType" minOccurs="0"></xsd:element>
> +            <xsd:choice>
> +
> +                <xsd:sequence>
> +                    <xsd:sequence minOccurs="0">
> +                        <xsd:element name="rtexprvalue" type="javaee:generic-booleanType"></xsd:element>
> +
> +                        <xsd:element name="type" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
> +                    </xsd:sequence>
> +
> +                    <xsd:choice>
> +                        <xsd:element name="deferred-value" type="javaee:tld-deferred-valueType" minOccurs="0"></xsd:element>
> +                        <xsd:element name="deferred-method" type="javaee:tld-deferred-methodType" minOccurs="0"></xsd:element>
> +                    </xsd:choice>
> +                </xsd:sequence>
> +
> +                <xsd:element name="fragment" type="javaee:generic-booleanType" minOccurs="0"></xsd:element>
> +
> +            </xsd:choice>
> +
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-canonical-nameType">
> +        <xsd:simpleContent>
> +            <xsd:restriction base="javaee:xsdNMTOKENType" />
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-deferred-methodType">
> +        <xsd:sequence>
> +            <xsd:element name="method-signature" type="javaee:string" minOccurs="0"></xsd:element>
> +        </xsd:sequence>
> +
> +        <xsd:attribute name="id" type="xsd:ID" />
> +
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-deferred-valueType">
> +
> +        <xsd:sequence>
> +            <xsd:element name="type" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
> +
> +        </xsd:sequence>
> +
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tld-extensionType">
> +        <xsd:sequence>
> +            <xsd:element name="extension-element" type="javaee:extensibleType" maxOccurs="unbounded" />
> +        </xsd:sequence>
> +
> +        <xsd:attribute name="namespace" use="required" type="xsd:anyURI" />
> +        <xsd:attribute name="id" type="xsd:ID" />
> +
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="tldTaglibType">
> +        <xsd:sequence>
> +            <xsd:group ref="javaee:descriptionGroup" />
> +            <xsd:element name="tlib-version" type="javaee:dewey-versionType"></xsd:element>
> +
> +            <xsd:element name="short-name" type="javaee:tld-canonical-nameType">
> +
> +            </xsd:element>
> +
> +            <xsd:element name="uri" type="javaee:xsdAnyURIType" minOccurs="0">
> +
> +            </xsd:element>
> +            <xsd:element name="validator" type="javaee:validatorType" minOccurs="0">
> +
> +            </xsd:element>
> +            <xsd:element name="listener" type="javaee:listenerType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +            <xsd:element name="tag" type="javaee:tagType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="tag-file" type="javaee:tagFileType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="function" type="javaee:functionType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="taglib-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="version" type="javaee:dewey-versionType" fixed="2.1" use="required"></xsd:attribute>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="validatorType">
> +        <xsd:sequence>
> +            <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
> +            <xsd:element name="validator-class" type="javaee:fully-qualified-classType"></xsd:element>
> +            <xsd:element name="init-param" type="javaee:param-valueType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
> +
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="variable-scopeType">
> +        <xsd:simpleContent>
> +
> +            <xsd:restriction base="javaee:string">
> +                <xsd:enumeration value="NESTED" />
> +                <xsd:enumeration value="AT_BEGIN" />
> +                <xsd:enumeration value="AT_END" />
> +            </xsd:restriction>
> +        </xsd:simpleContent>
> +    </xsd:complexType>
> +
> +    <xsd:complexType name="variableType">
> +        <xsd:sequence>
> +            <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
> +
> +            <xsd:choice>
> +                <xsd:element name="name-given" type="javaee:java-identifierType"></xsd:element>
> +
> +                <xsd:element name="name-from-attribute" type="javaee:java-identifierType"></xsd:element>
> +            </xsd:choice>
> +            <xsd:element name="variable-class" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
> +
> +            <xsd:element name="declare" type="javaee:generic-booleanType" minOccurs="0"></xsd:element>
> +            <xsd:element name="scope" type="javaee:variable-scopeType" minOccurs="0"></xsd:element>
> +        </xsd:sequence>
> +        <xsd:attribute name="id" type="xsd:ID" />
> +    </xsd:complexType>
> +</xsd:schema>
>
> Modified: geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml?rev=601048&r1=600870&r2=601048&view=diff
> ==============================================================================
> --- geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml (original)
> +++ geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml Tue Dec  4 11:25:44 2007
> @@ -31,14 +31,14 @@
>          <relativePath>../pom.xml</relativePath>
>      </parent>
>
> -    <artifactId>geronimo-saaj_1.1_spec</artifactId>
> +    <artifactId>geronimo-saaj_1.3_spec</artifactId>
>      <packaging>bundle</packaging>
> -    <name>SAAJ 1.1</name>
> -    <version>1.1.1-SNAPSHOT</version>
> +    <name>SAAJ 1.3</name>
> +    <version>1.0-SNAPSHOT</version>
>
>      <properties>
>             <geronimo.osgi.export.pkg>javax.xml.soap*</geronimo.osgi.export.pkg>
> -        <geronimo.osgi.export.version>1.1</geronimo.osgi.export.version>
> +        <geronimo.osgi.export.version>1.3</geronimo.osgi.export.version>
>         </properties>
>
>      <dependencies>
> @@ -51,8 +51,8 @@
>      </dependencies>
>
>      <scm>
> -        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.1_spec</connection>
> -        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.1_spec</developerConnection>
> -        <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.1_spec</url>
> +        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.3_spec</connection>
> +        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.3_spec</developerConnection>
> +        <url>https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-saaj_1.3_spec</url>
>      </scm>
>  </project>
>
>
>

Mime
View raw message