geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r486350 - in /geronimo/specs/trunk: geronimo-jsp_2.0_spec/src/main/schema/ geronimo-servlet_2.4_spec/src/main/schema/
Date Tue, 12 Dec 2006 21:57:57 GMT
Author: kevan
Date: Tue Dec 12 13:57:56 2006
New Revision: 486350

URL: http://svn.apache.org/viewvc?view=rev&rev=486350
Log:
GERONIMO-2630 More cleanup of specs...

Modified:
    geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.dtd
    geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.xsd
    geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_1.dtd
    geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_2.dtd
    geronimo/specs/trunk/geronimo-servlet_2.4_spec/src/main/schema/web-app_2_2.dtd

Modified: geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.dtd
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.dtd?view=diff&rev=486350&r1=486349&r2=486350
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.dtd (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.dtd Tue Dec 12 13:57:56
2006
@@ -1,3 +1,20 @@
+<!--
+  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
 -->

Modified: geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.xsd
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.xsd?view=diff&rev=486350&r1=486349&r2=486350
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.xsd (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/jspxml.xsd Tue Dec 12 13:57:56
2006
@@ -88,6 +88,22 @@
     </xsd:restriction>
   </xsd:simpleType>
 
+<!--
+  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.
+-->
   <xsd:simpleType name = "Bool">
     <xsd:annotation>
       <xsd:documentation>

Modified: geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_1.dtd
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_1.dtd?view=diff&rev=486350&r1=486349&r2=486350
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_1.dtd (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_1.dtd Tue
Dec 12 13:57:56 2006
@@ -1,180 +1,37 @@
 <!--
-
-   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) >
+  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.
+-->
+
+<!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">
+
+<!ELEMENT tlibversion (#PCDATA)>
+<!ELEMENT jspversion (#PCDATA)>
+<!ELEMENT shortname (#PCDATA)>
+<!ELEMENT uri (#PCDATA)>
+<!ELEMENT info (#PCDATA)>
+<!ELEMENT tag (name, tagclass, teiclass?, bodycontent?, info?, attribute*)>
+<!ELEMENT tagclass (#PCDATA)>
+<!ELEMENT teiclass (#PCDATA)>
+<!ELEMENT bodycontent (#PCDATA)>
+<!ELEMENT attribute (name, required? , rtexprvalue?)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT required (#PCDATA)>
+<!ELEMENT rtexprvalue (#PCDATA)>
 
 <!ATTLIST tlibversion id ID #IMPLIED>
 <!ATTLIST jspversion id ID #IMPLIED>

Modified: geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_2.dtd
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_2.dtd?view=diff&rev=486350&r1=486349&r2=486350
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_2.dtd (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.0_spec/src/main/schema/web-jsptaglibrary_1_2.dtd Tue
Dec 12 13:57:56 2006
@@ -1,444 +1,58 @@
 <!--
-
-   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.
+    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.
   -->
-
-<!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?) >
-
-
-<!--
+display-name?, small-icon?, large-icon?, description?, validator?,
+listener*, tag+)>
 
-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
--->
+<!ATTLIST taglib id ID #IMPLIED xmlns CDATA #FIXED "http://java.sun.com/JSP/TagLibraryDescriptor">
 
+<!ELEMENT tlib-version (#PCDATA)>
+<!ELEMENT jsp-version (#PCDATA)>
+<!ELEMENT short-name (#PCDATA)>
+<!ELEMENT uri (#PCDATA)>
+<!ELEMENT description (#PCDATA)>
+<!ELEMENT validator (validator-class, init-param*, description?)>
+<!ELEMENT validator-class (#PCDATA)>
 <!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 -->
+<!ELEMENT listener (listener-class)>
+<!ELEMENT listener-class (#PCDATA)>
+<!ELEMENT tag (name, tag-class, tei-class?, body-content?,
+display-name?, small-icon?, large-icon?, description?, variable*,
+attribute*, example?)>
+<!ELEMENT tag-class (#PCDATA)>
+<!ELEMENT tei-class (#PCDATA)>
+<!ELEMENT body-content (#PCDATA)>
+<!ELEMENT display-name (#PCDATA)>
+<!ELEMENT large-icon (#PCDATA)>
+<!ELEMENT small-icon (#PCDATA)>
+<!ELEMENT example (#PCDATA)>
+<!ELEMENT variable ( (name-given | name-from-attribute), variable-class?, declare?, scope?,
description?)>
+<!ELEMENT name-given (#PCDATA)>
+<!ELEMENT name-from-attribute (#PCDATA)>
+<!ELEMENT variable-class (#PCDATA)>
+<!ELEMENT declare (#PCDATA)>
+<!ELEMENT scope (#PCDATA)>
+<!ELEMENT attribute (name, required? , rtexprvalue?, type?, description?)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT required (#PCDATA)>
+<!ELEMENT rtexprvalue (#PCDATA)>
+<!ELEMENT type (#PCDATA)>
 
 <!ATTLIST tlib-version id ID #IMPLIED>
 <!ATTLIST jsp-version id ID #IMPLIED>
@@ -454,8 +68,6 @@
 <!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>

Modified: geronimo/specs/trunk/geronimo-servlet_2.4_spec/src/main/schema/web-app_2_2.dtd
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.4_spec/src/main/schema/web-app_2_2.dtd?view=diff&rev=486350&r1=486349&r2=486350
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.4_spec/src/main/schema/web-app_2_2.dtd (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.4_spec/src/main/schema/web-app_2_2.dtd Tue Dec
12 13:57:56 2006
@@ -1,7 +1,18 @@
-
 <!--
-The web-app element is the root of the deployment descriptor for
-a web application
+  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.
 -->
 
 <!ELEMENT web-app (icon?, display-name?, description?, distributable?,
@@ -10,495 +21,72 @@
 resource-ref*, security-constraint*, login-config?, security-role*,
 env-entry*, ejb-ref*)>
 
-<!--
-The icon element contains a small-icon and a large-icon element
-which specify the location within the web application for a small and
-large image used to represent the web application in a GUI tool. At a
-minimum, tools must accept GIF and JPEG format images.
--->
-
 <!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The small-icon element contains the location within the web
-application of a file containing a small (16x16 pixel) icon image.
--->
-
 <!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The large-icon element contains the location within the web
-application of a file containing a large (32x32 pixel) icon image.
--->
-
 <!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended
-to be displayed by GUI tools
--->
-
 <!ELEMENT display-name (#PCDATA)>
-
-<!--
-The description element is used to provide descriptive text about
-the parent element.
--->
-
 <!ELEMENT description (#PCDATA)>
-
-<!--
-The distributable element, by its presence in a web application
-deployment descriptor, indicates that this web application is
-programmed appropriately to be deployed into a distributed servlet
-container
--->
-
 <!ELEMENT distributable EMPTY>
-
-<!--
-The context-param element contains the declaration of a web
-application's servlet context initialization parameters.
--->
-
 <!ELEMENT context-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)>
-
-<!--
-The servlet element contains the declarative data of a
-servlet. If a jsp-file is specified and the load-on-startup element is
-present, then the JSP should be precompiled and loaded.
--->
-
-<!ELEMENT servlet (icon?, servlet-name, display-name?, description?,
-(servlet-class|jsp-file), init-param*, load-on-startup?, security-role-ref*)>
-
-<!--
-The servlet-name element contains the canonical name of the
-servlet.
--->
-
+<!ELEMENT servlet (icon?, servlet-name, display-name?,
+description?,(servlet-class|jsp-file), init-param*, load-on-startup?,
+security-role-ref*)>
 <!ELEMENT servlet-name (#PCDATA)>
-
-<!--
-The servlet-class element contains the fully qualified class name
-of the servlet.
--->
-
 <!ELEMENT servlet-class (#PCDATA)>
-
-<!--
-The jsp-file element contains the full path to a JSP file within
-the web application.
--->
-
 <!ELEMENT jsp-file (#PCDATA)>
-
-<!--
-The init-param element contains a name/value pair as an
-initialization param of the servlet
--->
-
 <!ELEMENT init-param (param-name, param-value, description?)>
-
-<!--
-The load-on-startup element indicates that this servlet should be
-loaded on the startup of the web application. The optional contents of
-these element must be a positive integer indicating the order in which
-the servlet should be loaded. Lower integers are loaded before higher
-integers. If no value is specified, or if the value specified is not a
-positive integer, the container is free to load it at any time in the
-startup sequence.
--->
-
 <!ELEMENT load-on-startup (#PCDATA)>
-
-<!--
-The servlet-mapping element defines a mapping between a servlet
-and a url pattern
--->
-
 <!ELEMENT servlet-mapping (servlet-name, url-pattern)>
-
-<!--
-The url-pattern element contains the url pattern of the
-mapping. Must follow the rules specified in Section 10 of the Servlet
-API Specification.
--->
-
 <!ELEMENT url-pattern (#PCDATA)>
-
-<!--
-The session-config element defines the session parameters for
-this web application.
--->
-
 <!ELEMENT session-config (session-timeout?)>
-
-<!--
-The session-timeout element defines the default session timeout
-interval for all sessions created in this web application. The
-specified timeout must be expressed in a whole number of minutes.
--->
-
 <!ELEMENT session-timeout (#PCDATA)>
-
-<!--
-The mime-mapping element defines a mapping between an extension
-and a mime type.
--->
-
 <!ELEMENT mime-mapping (extension, mime-type)>
-
-<!--
-The extension element contains a string describing an
-extension. example: "txt"
--->
-
 <!ELEMENT extension (#PCDATA)>
-
-<!--
-The mime-type element contains a defined mime type. example:
-"text/plain"
--->
-
 <!ELEMENT mime-type (#PCDATA)>
-
-<!--
-The welcome-file-list contains an ordered list of welcome files
-elements.
--->
-
 <!ELEMENT welcome-file-list (welcome-file+)>
-
-<!--
-The welcome-file element contains file name to use as a default
-welcome file, such as index.html
--->
-
 <!ELEMENT welcome-file (#PCDATA)>
-
-<!--
-The taglib element is used to describe a JSP tag library.
--->
-
 <!ELEMENT taglib (taglib-uri, taglib-location)>
-
-<!--
-The taglib-uri element describes a URI, relative to the location
-of the web.xml document, identifying a Tag Library used in the Web
-Application.
--->
-
 <!ELEMENT taglib-uri (#PCDATA)>
-
-<!--
-the taglib-location element contains the location (as a resource
-relative to the root of the web application) where to find the Tag
-Libary Description file for the tag library.
--->
-
 <!ELEMENT taglib-location (#PCDATA)>
-
-<!--
-The error-page element contains a mapping between an error code
-or exception type to the path of a resource in the web application
--->
-
 <!ELEMENT error-page ((error-code | exception-type), location)>
-
-<!--
-The error-code contains an HTTP error code, ex: 404
--->
-
 <!ELEMENT error-code (#PCDATA)>
-
-<!--
-The exception type contains a fully qualified class name of a
-Java exception type.
--->
-
 <!ELEMENT exception-type (#PCDATA)>
-
-<!--
-The location element contains the location of the resource in the
-web application
--->
-
 <!ELEMENT location (#PCDATA)>
-
-<!--
-The resource-ref element contains a declaration of a Web
-Application's reference to an external resource.
--->
-
 <!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth)>
-
-<!--
-The res-ref-name element specifies the name of the resource
-factory reference name.
--->
-
 <!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-The res-type element specifies the (Java class) type of the data
-source.
--->
-
 <!ELEMENT res-type (#PCDATA)>
-
-<!--
-The res-auth element indicates whether the application component
-code performs resource signon programmatically or whether the
-container signs onto the resource based on the principle mapping
-information supplied by the deployer. Must be CONTAINER or SERVLET
--->
-
 <!ELEMENT res-auth (#PCDATA)>
-
-<!--
-The security-constraint element is used to associate security
-constraints with one or more web resource collections
--->
-
 <!ELEMENT security-constraint (web-resource-collection+,
 auth-constraint?, user-data-constraint?)>
-
-<!--
-The web-resource-collection element is used to identify a subset
-of the resources and HTTP methods on those resources within a web
-application to which a security constraint applies. If no HTTP methods
-are specified, then the security constraint applies to all HTTP
-methods.
--->
-
-<!ELEMENT web-resource-collection (web-resource-name, description?,
-url-pattern*, http-method*)>
-
-<!--
-The web-resource-name contains the name of this web resource
-collection
--->
-
+<!ELEMENT web-resource-collection (web-resource-name,
+description?,url-pattern*, http-method*)>
 <!ELEMENT web-resource-name (#PCDATA)>
-
-<!--
-The http-method contains an HTTP method (GET | POST |...)
--->
-
 <!ELEMENT http-method (#PCDATA)>
-
-<!--
-The user-data-constraint element is used to indicate how data
-communicated between the client and container should be protected
--->
-
 <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-
-<!--
-The transport-guarantee element specifies that the communication
-between client and server should be NONE, INTEGRAL, or
-CONFIDENTIAL. NONE means that the application does not require any
-transport guarantees. A value of INTEGRAL means that the application
-requires that the data sent between the client and server be sent in
-such a way that it can't be changed in transit. CONFIDENTIAL means
-that the application requires that the data be transmitted in a
-fashion that prevents other entities from observing the contents of
-the transmission. In most cases, the presence of the INTEGRAL or
-CONFIDENTIAL flag will indicate that the use of SSL is required.
--->
-
 <!ELEMENT transport-guarantee (#PCDATA)>
-
-<!--
-The auth-constraint element indicates the user roles that should
-be permitted access to this resource collection. The role used here
-must appear in a security-role-ref element.
--->
-
 <!ELEMENT auth-constraint (description?, role-name*)>
-
-<!--
-The role-name element contains the name of a security role.
--->
-
 <!ELEMENT role-name (#PCDATA)>
-
-<!--
-The login-config element is used to configure the authentication
-method that should be used, the realm name that should be used for
-this application, and the attributes that are needed by the form login
-mechanism.
--->
-
 <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-
-<!--
-The realm name element specifies the realm name to use in HTTP
-Basic authorization
--->
-
 <!ELEMENT realm-name (#PCDATA)>
-
-<!--
-The form-login-config element specifies the login and error pages
-that should be used in form based login. If form based authentication
-is not used, these elements are ignored.
--->
-
 <!ELEMENT form-login-config (form-login-page, form-error-page)>
-
-<!--
-The form-login-page element defines the location in the web app
-where the page that can be used for login can be found
--->
-
 <!ELEMENT form-login-page (#PCDATA)>
-
-<!--
-The form-error-page element defines the location in the web app
-where the error page that is displayed when login is not successful
-can be found
--->
-
 <!ELEMENT form-error-page (#PCDATA)>
-
-<!--
-The auth-method element is used to configure the authentication
-mechanism for the web application. As a prerequisite to gaining access
-to any web resources which are protected by an authorization
-constraint, a user must have authenticated using the configured
-mechanism. Legal values for this element are "BASIC", "DIGEST",
-"FORM", or "CLIENT-CERT".
--->
-
 <!ELEMENT auth-method (#PCDATA)>
-
-<!--
-The security-role element contains the declaration of a security
-role which is used in the security-constraints placed on the web
-application.
--->
-
 <!ELEMENT security-role (description?, role-name)>
-
-<!--
-The role-name element contains the name of a role. This element
-must contain a non-empty string.
--->
-
 <!ELEMENT security-role-ref (description?, role-name, role-link)>
-
-<!--
-The role-link element is used to link a security role reference
-to a defined security role. The role-link element must contain the
-name of one of the security roles defined in the security-role
-elements.
--->
-
 <!ELEMENT role-link (#PCDATA)>
-
-<!--
-The env-entry element contains the declaration of an
-application's environment entry. This element is required to be
-honored on in J2EE compliant servlet containers.
--->
-
-<!ELEMENT env-entry (description?, env-entry-name, env-entry-value?,
-env-entry-type)>
-
-<!--
-The env-entry-name contains the name of an application's
-environment entry
--->
-
+<!ELEMENT env-entry (description?, env-entry-name, env-entry-value?, env-entry-type)>
 <!ELEMENT env-entry-name (#PCDATA)>
-
-<!--
-The env-entry-value element contains the value of an
-application's environment entry
--->
-
 <!ELEMENT env-entry-value (#PCDATA)>
-
-<!--
-The env-entry-type element contains the fully qualified Java type
-of the environment entry value that is expected by the application
-code. The following are the legal values of env-entry-type:
-java.lang.Boolean, java.lang.String, java.lang.Integer,
-java.lang.Double, java.lang.Float.
--->
-
 <!ELEMENT env-entry-type (#PCDATA)>
-
-<!--
-The ejb-ref element is used to declare a reference to an
-enterprise bean. 
--->
-
-<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type, home, remote,
-ejb-link?)>
-
-<!--
-The ejb-ref-name element contains the name of an EJB
-reference. This is the JNDI name that the servlet code uses to get a
-reference to the enterprise bean.
--->
-
+<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type, home, remote, ejb-link?)>
 <!ELEMENT ejb-ref-name (#PCDATA)>
-
-<!--
-The ejb-ref-type element contains the expected java class type of
-the referenced EJB.
--->
-
 <!ELEMENT ejb-ref-type (#PCDATA)>
-
-<!--
-The ejb-home element contains the fully qualified name of the
-EJB's home interface
--->
-
 <!ELEMENT home (#PCDATA)>
-
-<!--
-The ejb-remote element contains the fully qualified name of the
-EJB's remote interface
--->
-
 <!ELEMENT remote (#PCDATA)>
-
-<!--
-The ejb-link element is used in the ejb-ref element to specify
-that an EJB reference is linked to an EJB in an encompassing Java2
-Enterprise Edition (J2EE) application package. The value of the
-ejb-link element must be the ejb-name of and EJB in the J2EE
-application package.
--->
-
 <!ELEMENT ejb-link (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools to easily make tool-specific
-references to the elements of the deployment descriptor. This allows
-tools that produce additional deployment information (i.e information
-beyond the standard deployment descriptor information) to store the
-non-standard information in a separate file, and easily refer from
-these tools-specific files to the information in the standard web-app
-deployment descriptor.
--->
 
 <!ATTLIST web-app id ID #IMPLIED>
 <!ATTLIST icon id ID #IMPLIED>



Mime
View raw message