craigmcc 01/03/22 09:20:19
Modified: catalina/src/conf web_23.dtd
catalina/src/share/org/apache/catalina Wrapper.java
catalina/src/share/org/apache/catalina/core
StandardContext.java StandardWrapper.java
catalina/src/share/org/apache/catalina/deploy
ContextEjb.java
catalina/src/share/org/apache/catalina/startup
ContextConfig.java
catalina/src/share/org/apache/naming EjbRef.java
jasper/src/share/org/apache/jasper/compiler
TldLocationsCache.java
jasper/src/share/org/apache/jasper/resources
messages.properties web_23.dtd
Log:
Reflect the change in the <run-as> element approved by the JSR-053 expert
group. Clean up a missing Jasper error message discovered when debugging
this change.
Revision Changes Path
1.3 +321 -212 jakarta-tomcat-4.0/catalina/src/conf/web_23.dtd
Index: web_23.dtd
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web_23.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web_23.dtd 2000/10/29 00:35:03 1.2
+++ web_23.dtd 2001/03/22 17:19:37 1.3
@@ -1,321 +1,381 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+The web-app element is the root of the deployment descriptor for
+a web application
+-->
-<!-- TEMPORARY DTD FOR THE SERVLET 2.3 WEB APPLICATION DEPLOYMENT
- DESCRIPTOR. THIS WILL BE REPLACED BY THE OFFICIAL ONE WHEN
- IT IS POSTED -->
-
-<!-- The web-app element is the root of the deployment descriptor for
-a web application -->
-
-<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
-context-param*, filter*, filter-mapping*, listener*,
-servlet*, servlet-mapping*, session-config?,
+<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
context-param*, filter*, filter-mapping*, listener*, servlet*, servlet-mapping*,
session-config?,
mime-mapping*, welcome-file-list?, error-page*, taglib*,
-resource-env-ref*, resource-ref*, security-constraint*,
-login-config?, security-role*, env-entry*, ejb-ref*)>
+resource-env-ref*, resource-ref*, security-constraint*, login-config?,
security-role*,
+env-entry*, ejb-ref*)>
-<!-- Declares a filter in the web application deployment descriptor.
-The filter is mapped to either a servlet or a URL pattern in the
-filter-mapping element, using the filter-name value to reference.
-Filters can access the initialization parameters declared in the
-deployment descriptor at runtime via the FilterConfig interface. -->
+<!--
+Declares a filter in the web application. The filter is mapped to either a servlet
or a URL pattern in the filter-mapping element, using the filter-name value to
reference. Filters can access the initialization parameters declared in the deployment
descriptor at runtime via the FilterConfig interface.
+-->
<!ELEMENT filter (icon?, filter-name, display-name?, description?,
-filter-class, init-param*)>
-
-<!-- The logical name of the filter. This name is used to map
-the filter. -->
+filter-class, init-param*)>
+<!--
+The logical name of the filter. This name is used to map the filter.
+-->
<!ELEMENT filter-name (#PCDATA)>
-
-<!-- The fully qualified classname of the filter. -->
+<!--
+The fully qualified classname of the filter.
+-->
<!ELEMENT filter-class (#PCDATA)>
-<!-- Declaration of the filter mappings in this web application.
-The conatiner uses the filter-mapping declarations to decide which
-filters to apply to a request, and in what order. The container
-matches the request URI to a Servlet in the normal way. To determine
-which filters to apply it matches filter-mapping declarations either
-on servlet-name, or on url-pattern for each filter-mapping element,
-depending on which style is used. The order in which filters are
-invoked is the order in which filter-mapping declarations that match
-a request URI for a servlet appear in the list of filter-mapping
-elements. The filter-name value must be the value of the filter-
-name sub-elements of one of the filter declarations in the
-deployment descriptor. -->
+<!--
+Declaration of the filter mappings in this web application. The container uses the
filter-mapping declarations to decide which filters to apply to a request, and in what
order. The container matches the request URI to a Servlet in the normal way. To
determine which filters to apply it matches filter-mapping declarations either on
servlet-name, or on url-pattern for each filter-mapping element, depending on which
style is used. The order in which filters are invoked is the order in which
filter-mapping declarations that match a request URI for a servlet appear in the list
of filter-mapping elements.The filter-name value must be the value of the
<filter-name> sub-elements of one of the <filter> declarations in the deployment
descriptor.
+-->
<!ELEMENT filter-mapping (filter-name, (url-pattern | servlet-name))>
-<!-- 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. -->
+<!--
+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. -->
+<!--
+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
+<!--
+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 -->
+<!--
+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. -->
+<!--
+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
+<!--
+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 -->
+container
+-->
<!ELEMENT distributable EMPTY>
-<!-- The context-param element contains the declaration of a web
-application's servlet context initialization parameters. -->
+<!--
+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. -->
+<!--
+The param-name element contains the name of a parameter.
+-->
<!ELEMENT param-name (#PCDATA)>
-<!-- The param-value element contains the value of a parameter. -->
+<!--
+The param-value element contains the value of a parameter.
+-->
<!ELEMENT param-value (#PCDATA)>
-<!-- The listener element indicates the deployment properties
-for a web application listener bean. -->
+<!--
+The listener element indicates the deployment properties for a web application
listener bean.
+-->
<!ELEMENT listener (listener-class)>
-<!-- The listener-class element declares a class in the application
-must be registered as a web application listener bean. -->
+<!--
+The listener-class element declares a class in the application must be registered
as a web application listener bean.
+-->
<!ELEMENT listener-class (#PCDATA)>
+
-<!-- The servlet element contains the declarative data of a
+<!--
+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. -->
+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*)>
+(servlet-class|jsp-file), init-param*, load-on-startup?, run-as?,
security-role-ref*)>
-<!-- The servlet-name element contains the canonical name of the
-servlet. -->
+<!--
+The servlet-name element contains the canonical name of the
+servlet.
+-->
<!ELEMENT servlet-name (#PCDATA)>
-<!-- The servlet-class element contains the fully qualified class name
-of the servlet. -->
+<!--
+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 beginning with a '/'. -->
+<!--
+The jsp-file element contains the full path to a JSP file within
+the web application beginning with a `/'.
+-->
<!ELEMENT jsp-file (#PCDATA)>
-<!-- The init-param element contains a name/value pair as an
-initialization param of the servlet -->
+<!--
+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
+<!--
+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. -->
+startup sequence.
+-->
<!ELEMENT load-on-startup (#PCDATA)>
-<!-- The servlet-mapping element defines a mapping between a servlet
-and a url pattern -->
+<!--
+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 11.2 of the Servlet
-API Specification. -->
+<!--
+The url-pattern element contains the url pattern of the
+mapping. Must follow the rules specified in Section 11.2 of the Servlet API
Specification.
+-->
<!ELEMENT url-pattern (#PCDATA)>
-<!-- The session-config element defines the session parameters for
-this web application. -->
+<!--
+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
+<!--
+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. -->
+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. -->
+<!--
+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" -->
+<!--
+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" -->
+<!--
+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. -->
+<!--
+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 -->
+<!--
+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. -->
+<!--
+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
+<!--
+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. -->
+Application.
+-->
<!ELEMENT taglib-uri (#PCDATA)>
-<!-- the taglib-location element contains the location (as a resource
+<!--
+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. -->
+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 -->
+<!--
+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 -->
+<!--
+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. -->
+<!--
+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 -->
+<!--
+The location element contains the location of the resource in the
+web application relative to the root of the web application. The value of the
location must have a leading `/'.
+-->
<!ELEMENT location (#PCDATA)>
-<!-- The resource-env-ref element contains a declaration of a component's
-reference to an administered object associated with a resource in the
-component's environment. It consists of an optional description, the
-resource environment reference name, and an indication of the resource
-environment reference type expected by the component's code. Examples:
- <resource-env-ref>
- <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
- <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
- </resource-env-ref>
+<!-- The resource-env-ref element contains a declaration of an component's
reference to an administered object associated with a resource in the component's
environment. It consists of an optional description, the resource environment
reference name, and an indica-tion of the resource environment reference type expected
by the component's code.
+Examples:
+<resource-env-ref>
+
+
+
+ <resource-env-ref-name>jms/StockQueue </resource-env-ref-name>
+ <resource-env-ref-type>javax.jms.Queue </resource-env-ref-type>
+</resource-env-ref>
-->
-<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
+<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
resource-env-ref-type)>
-<!-- The resource-env-ref-name element specifies the name of a
-resource environment reference; its value is the environment entry
-name used in code. -->
+<!-- The resource-env-ref-name element specifies the name of a resource environment
reference; its value is the environment entry name used in code.
+ -->
<!ELEMENT resource-env-ref-name (#PCDATA)>
-<!-- The resource-env-ref-type element specifies the type of a
-resource environment reference. Web containers in J2EE are requird
-to support javax.jms.Topic and javax.jms.Queue. -->
+<!-- The resource-env-ref-type element specifies the type of a resource environment
reference. Web containers in J2EE are required to support javax.jms.Topic and
javax.jms.Queue
+-->
<!ELEMENT resource-env-ref-type (#PCDATA)>
-<!-- The resource-ref element contains a declaration of a Web
-Application's reference to an external resource. -->
+<!--
+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,
-res-sharing-scope?)>
+<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
res-sharing-scope?)>
-<!-- The res-ref-name element specifies the name of the resource
-factory reference name. -->
+<!--
+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. -->
+<!--
+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
+<!--
+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. The allowed values are
+information supplied by the deployer. The allowed values are
<res-auth>Application</res-auth>
<res-auth>Container</res-auth>
-for those respective cases. -->
+for those respective cases.
+-->
<!ELEMENT res-auth (#PCDATA)>
-<!-- The res-sharing-scope element specifies whether connections
-obtained through the given resource manager connection factory
-reference can be shared. The value of this element, if specified,
-must be one of the two following:
- <res-sharing-scope>Shareable</res-sharing-scope>
- <res-sharing-scope>Unshareable</res-sharing-scope>
-The default value is Shareable. -->
+<!-- The res-sharing-scope element specifies whether connections obtained through
the given resource manager connection factory reference can be shared. The value of
this element, if specified, must be one of the two following:
<res-sharing-scope>Shareable</res-sharing-scope>
+<res-sharing-scope>Unshareable</res-sharing-scope> The default value is Shareable.
+-->
<!ELEMENT res-sharing-scope (#PCDATA)>
+
+<!--
+The security-constraint element is used to associate security
+constraints with one or more web resource collections
+-->
-<!-- The security-constraint element is used to associate security
-constraints with one or more web resource collections -->
+
<!ELEMENT security-constraint (display-name?, web-resource-collection+,
auth-constraint?, user-data-constraint?)>
-<!-- The web-resource-collection element is used to identify a subset
+<!--
+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. -->
+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 -->
+<!--
+The web-resource-name contains the name of this web resource
+collection
+-->
<!ELEMENT web-resource-name (#PCDATA)>
-<!-- The http-method contains an HTTP method (GET | POST |...) -->
+<!--
+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 -->
+<!--
+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
+<!--
+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
@@ -324,162 +384,212 @@
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. -->
+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
+<!--
+The auth-constraint element indicates the user roles that should
be permitted access to this resource collection. The role used here
-must either appear in a security-role-ref element, or be the specially
-reserved role-name "*" that is a compact syntax for indicating all
-roles in the web application. If both "*" and rolenames appear, the
-container interprets this as all roles. -->
+must either in a security-role-ref element, or be the specially reserved role-name
"*" that is a compact syntax for indicating all roles in the web application. If both
"*" and rolenames appear, the container interprets this as all roles.
+-->
<!ELEMENT auth-constraint (description?, role-name*)>
-<!-- The role-name element contains the name of a security role. -->
+<!--
+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
+<!--
+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. -->
+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 -->
+<!--
+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
+<!--
+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. -->
+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 -->
+<!--
+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
+<!--
+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 -->
+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
+<!--
+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". -->
+"FORM", or "CLIENT-CERT".
+-->
<!ELEMENT auth-method (#PCDATA)>
-<!-- The security-role element contains the declaration of a security
+<!--
+The security-role element contains the declaration of a security
role which is used in the security-constraints placed on the web
-application. -->
+application.
+-->
<!ELEMENT security-role (description?, role-name)>
+
+<!--
+The security-role-ref element defines a mapping between the name of role called
from a Servlet using
+isUserInRole(String name) and the name of a security role defined for the web
application. For example,
+to map the security role reference "FOO" to the security role with role-name
"manager" the sytax would
+be:
+
+<security-role-ref>
+
-<!-- The security-role-ref element defines a mapping between the name
-of a role called from a Servlet using isUserInRole(String name) and the
-name of a security role defined for the web application. For example,
-to map the security role reference "FOO" to the security role with the
-role-name "manager", the syntax would be:
- <security-role-ref>
- <role-name>FOO</role-name>
- <role-link>manager</role-link>
- </security-role-ref>
-In this case if the servlet called by a user belonging to the "manager"
-security role made the API call isUserInRole("FOO") the result would be true.
-Since the role-name "*" has a special meaning for authorization constraints,
-its value is not permitted here. -->
-<!ELEMENT security-role-ref (description?, role-name, role-link)>
-<!-- The role-link element is used to link a security role reference
+<role-name>FOO</role-name>
+
+<role-link>manager</manager>
+</security-role-ref>
+
+In this case if the servlet called by a user belonging to the "manager" security
role made the API call
+isUserInRole("FOO") the result would be true.
+Since the role-name "*" has a special meaning for authorization constraints, its
value is not permitted here.
+-->
+
+<!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. -->
+elements.
+-->
<!ELEMENT role-link (#PCDATA)>
-<!-- The env-entry element contains the declaration of an
+<!--
+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. -->
+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 -->
+<!--
+The env-entry-name contains the name of an application's
+environment entry
+-->
<!ELEMENT env-entry-name (#PCDATA)>
-<!-- The env-entry-value element contains the value of an
-application's environment entry -->
+<!--
+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
+<!--
+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. -->
+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. -->
+<!--
+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?, run-as?)>
+<!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
+<!--
+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. -->
+reference to the enterprise bean.
+-->
<!ELEMENT ejb-ref-name (#PCDATA)>
-<!-- The ejb-ref-type element contains the expected java class type of
-the referenced EJB. -->
+<!-- The ejb-ref-type element contains the expected type of the referenced
enterprise bean. The ejb-ref-type element must be one of the following:
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <ejb-ref-type>Session</ejb-ref-type>
+-->
+
<!ELEMENT ejb-ref-type (#PCDATA)>
-<!-- The ejb-home element contains the fully qualified name of the
-EJB's home interface -->
+<!--
+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 -->
+<!--
+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
+<!--
+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. -->
+application package.
+-->
<!ELEMENT ejb-link (#PCDATA)>
+
-<!-- The runAs element must contain the name of a security role
-defined for this web application. -->
+<!--
+The run-as element must contain the name of a security role defined for this web
application. If the optional run-as element is used for a servlet definition, the
security identity of a call to any EJBs from the servlet must be propogated as the
security role with the same name.
+-->
+
<!ELEMENT run-as (#PCDATA)>
+
-<!-- The ID mechanism is to allow tools to easily make tool-specific
+<!--
+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. -->
+deployment descriptor.
+-->
<!ATTLIST web-app id ID #IMPLIED>
<!ATTLIST filter id ID #IMPLIED>
@@ -554,5 +664,4 @@
<!ATTLIST home id ID #IMPLIED>
<!ATTLIST remote id ID #IMPLIED>
<!ATTLIST ejb-link id ID #IMPLIED>
-<!ATTLIST run-as iid ID #IMPLIED>
-
+<!ATTLIST run-as id ID #IMPLIED>
1.3 +18 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Wrapper.java
Index: Wrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Wrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Wrapper.java 2000/08/23 01:07:07 1.2
+++ Wrapper.java 2001/03/22 17:19:41 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Wrapper.java,v 1.2
2000/08/23 01:07:07 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/08/23 01:07:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Wrapper.java,v 1.3
2001/03/22 17:19:41 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/03/22 17:19:41 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* <code>IllegalArgumentException</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/08/23 01:07:07 $
+ * @version $Revision: 1.3 $ $Date: 2001/03/22 17:19:41 $
*/
public interface Wrapper extends Container {
@@ -148,6 +148,20 @@
* @param value New load-on-startup value
*/
public void setLoadOnStartup(int value);
+
+
+ /**
+ * Return the run-as identity for this servlet.
+ */
+ public String getRunAs();
+
+
+ /**
+ * Set the run-as identity for this servlet.
+ *
+ * @param value New run-as identity value
+ */
+ public void setRunAs(String runAs);
/**
1.44 +5 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- StandardContext.java 2001/03/18 05:32:12 1.43
+++ StandardContext.java 2001/03/22 17:19:45 1.44
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.43 2001/03/18 05:32:12 craigmcc Exp $
- * $Revision: 1.43 $
- * $Date: 2001/03/18 05:32:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.44 2001/03/22 17:19:45 craigmcc Exp $
+ * $Revision: 1.44 $
+ * $Date: 2001/03/22 17:19:45 $
*
* ====================================================================
*
@@ -140,7 +140,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.43 $ $Date: 2001/03/18 05:32:12 $
+ * @version $Revision: 1.44 $ $Date: 2001/03/22 17:19:45 $
*/
public class StandardContext
@@ -3379,8 +3379,7 @@
ContextEjb ejb = (ContextEjb) ejbsList.next();
// Create a reference to the EJB.
Reference ref = new EjbRef
- (ejb.getType(), ejb.getHome(), ejb.getRemote(), ejb.getLink(),
- ejb.getRunAs());
+ (ejb.getType(), ejb.getHome(), ejb.getRemote(), ejb.getLink());
// Adding the additional parameters, if any
addAdditionalParameters(ref, ejb.getName());
try {
1.17 +34 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- StandardWrapper.java 2001/03/18 05:32:12 1.16
+++ StandardWrapper.java 2001/03/22 17:19:47 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.16 2001/03/18 05:32:12 craigmcc Exp $
- * $Revision: 1.16 $
- * $Date: 2001/03/18 05:32:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.17 2001/03/22 17:19:47 craigmcc Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/03/22 17:19:47 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* make them efficient are counter-productive.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.16 $ $Date: 2001/03/18 05:32:12 $
+ * @version $Revision: 1.17 $ $Date: 2001/03/22 17:19:47 $
*/
public final class StandardWrapper
@@ -204,6 +204,12 @@
/**
+ * The run-as identity for this servlet.
+ */
+ private String runAs = null;
+
+
+ /**
* The fully qualified servlet class name for this servlet.
*/
private String servletClass = null;
@@ -388,6 +394,30 @@
throw new IllegalArgumentException
(sm.getString("standardWrapper.notContext"));
super.setParent(container);
+
+ }
+
+
+ /**
+ * Return the run-as identity for this servlet.
+ */
+ public String getRunAs() {
+
+ return (this.runAs);
+
+ }
+
+
+ /**
+ * Set the run-as identity for this servlet.
+ *
+ * @param value New run-as identity value
+ */
+ public void setRunAs(String runAs) {
+
+ String oldRunAs = this.runAs;
+ this.runAs = runAs;
+ support.firePropertyChange("runAs", oldRunAs, this.runAs);
}
1.4 +4 -22
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java
Index: ContextEjb.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextEjb.java 2000/08/20 03:42:06 1.3
+++ ContextEjb.java 2001/03/22 17:19:52 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java,v
1.3 2000/08/20 03:42:06 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/08/20 03:42:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java,v
1.4 2001/03/22 17:19:52 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/03/22 17:19:52 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* deployment descriptor.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2000/08/20 03:42:06 $
+ * @version $Revision: 1.4 $ $Date: 2001/03/22 17:19:52 $
*/
public final class ContextEjb {
@@ -151,20 +151,6 @@
/**
- * The "run as" remote identity for this bean.
- */
- private String runAs = null;
-
- public String getRunAs() {
- return (this.runAs);
- }
-
- public void setRunAs(String runAs) {
- this.runAs = runAs;
- }
-
-
- /**
* The name of the EJB bean implementation class.
*/
private String type = null;
@@ -208,10 +194,6 @@
if (link != null) {
sb.append(", link=");
sb.append(link);
- }
- if (runAs != null) {
- sb.append(", runAs=");
- sb.append(runAs);
}
sb.append("]");
return (sb.toString());
1.42 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ContextConfig.java 2001/02/26 03:53:12 1.41
+++ ContextConfig.java 2001/03/22 17:19:58 1.42
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.41 2001/02/26 03:53:12 glenn Exp $
- * $Revision: 1.41 $
- * $Date: 2001/02/26 03:53:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.42 2001/03/22 17:19:58 craigmcc Exp $
+ * $Revision: 1.42 $
+ * $Date: 2001/03/22 17:19:58 $
*
* ====================================================================
*
@@ -120,7 +120,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.41 $ $Date: 2001/02/26 03:53:12 $
+ * @version $Revision: 1.42 $ $Date: 2001/03/22 17:19:58 $
*/
public final class ContextConfig
@@ -476,8 +476,6 @@
mapper.methodSetter("setRemote", 0));
mapper.addRule("web-app/ejb-ref/ejb-link",
mapper.methodSetter("setLink", 0));
- mapper.addRule("web-app/ejb-ref/run-as",
- mapper.methodSetter("setRunAs", 0));
mapper.addRule("web-app/env-entry",
mapper.objectCreate("org.apache.catalina.deploy.ContextEnvironment"));
@@ -634,6 +632,8 @@
mapper.methodSetter("setJspFile", 0));
mapper.addRule("web-app/servlet/load-on-startup",
mapper.methodSetter("setLoadOnStartupString", 0));
+ mapper.addRule("web-app/servlet/run-as",
+ mapper.methodSetter("setRunAs", 0));
mapper.addRule("web-app/servlet/security-role-ref",
mapper.methodSetter("addSecurityReference", 2));
mapper.addRule("web-app/servlet/security-role-ref/role-link",
1.2 +7 -20
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRef.java
Index: EjbRef.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EjbRef.java 2000/11/04 06:46:08 1.1
+++ EjbRef.java 2001/03/22 17:20:04 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRef.java,v 1.1
2000/11/04 06:46:08 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/04 06:46:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/EjbRef.java,v 1.2
2001/03/22 17:20:04 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/03/22 17:20:04 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Represents a reference address to an EJB.
*
* @author Remy Maucherat
- * @version $Revision: 1.1 $ $Date: 2000/11/04 06:46:08 $
+ * @version $Revision: 1.2 $ $Date: 2001/03/22 17:20:04 $
*/
public class EjbRef
@@ -108,12 +108,6 @@
public static final String LINK = "link";
- /**
- * RunAs address type.
- */
- public static final String RUNAS = "runas";
-
-
// ----------------------------------------------------------- Constructors
@@ -124,11 +118,9 @@
* @param home Home interface classname
* @param remote Remote interface classname
* @param link EJB link
- * @param runAs Run As
*/
- public EjbRef(String ejbType, String home, String remote, String link,
- String runAs) {
- this(ejbType, home, remote, link, runAs, null, null);
+ public EjbRef(String ejbType, String home, String remote, String link) {
+ this(ejbType, home, remote, link, null, null);
}
@@ -139,10 +131,9 @@
* @param home Home interface classname
* @param remote Remote interface classname
* @param link EJB link
- * @param runAs Run As
*/
public EjbRef(String ejbType, String home, String remote, String link,
- String runAs, String factory, String factoryLocation) {
+ String factory, String factoryLocation) {
super(home, factory, factoryLocation);
StringRefAddr refAddr = null;
if (ejbType != null) {
@@ -155,10 +146,6 @@
}
if (link != null) {
refAddr = new StringRefAddr(LINK, link);
- add(refAddr);
- }
- if (runAs != null) {
- refAddr = new StringRefAddr(RUNAS, runAs);
add(refAddr);
}
}
1.8 +3 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TldLocationsCache.java
Index: TldLocationsCache.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TldLocationsCache.java 2001/03/18 05:32:13 1.7
+++ TldLocationsCache.java 2001/03/22 17:20:08 1.8
@@ -137,7 +137,9 @@
processWebDotXml(ctxt);
processJars(ctxt);
} catch (JasperException ex) {
- Constants.message(ex.getMessage(), Logger.ERROR);
+ Constants.message("jsp.error.internal.tldinit",
+ new Object[] { ex.getMessage() },
+ Logger.ERROR);
}
}
1.14 +2 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- messages.properties 2000/12/22 01:27:39 1.13
+++ messages.properties 2001/03/22 17:20:14 1.14
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.13 2000/12/22 01:27:39 pierred Exp $
+# $Id: messages.properties,v 1.14 2001/03/22 17:20:14 craigmcc Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -220,6 +220,7 @@
jsp.error.no.more.content=End of content reached while more parsing required: tag
nesting error?
jsp.error.parse.xml=XML parsing error on file {0}: {1}
jsp.error.parse.xml.line=XML parsing error on file {0}: (line {1}, col {2}): {3}
+jsp.error.internal.tldinit=Exception initializing TldLocationsCache: {0}
jsp.error.internal.filenotfound=Internal Error: File {0} not found
jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: {0}
jsp.error.include.flush.invalid.value=Invalid value for the flush attribute: {0}
1.3 +321 -211
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/web_23.dtd
Index: web_23.dtd
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/web_23.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web_23.dtd 2000/10/30 14:35:51 1.2
+++ web_23.dtd 2001/03/22 17:20:16 1.3
@@ -1,321 +1,381 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+The web-app element is the root of the deployment descriptor for
+a web application
+-->
-<!-- TEMPORARY DTD FOR THE SERVLET 2.3 WEB APPLICATION DEPLOYMENT
- DESCRIPTOR. THIS WILL BE REPLACED BY THE OFFICIAL ONE WHEN
- IT IS POSTED -->
-
-<!-- The web-app element is the root of the deployment descriptor for
-a web application -->
-
-<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
-context-param*, filter*, filter-mapping*, listener*,
-servlet*, servlet-mapping*, session-config?,
+<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
context-param*, filter*, filter-mapping*, listener*, servlet*, servlet-mapping*,
session-config?,
mime-mapping*, welcome-file-list?, error-page*, taglib*,
-resource-env-ref*, resource-ref*, security-constraint*,
-login-config?, security-role*, env-entry*, ejb-ref*)>
+resource-env-ref*, resource-ref*, security-constraint*, login-config?,
security-role*,
+env-entry*, ejb-ref*)>
-<!-- Declares a filter in the web application deployment descriptor.
-The filter is mapped to either a servlet or a URL pattern in the
-filter-mapping element, using the filter-name value to reference.
-Filters can access the initialization parameters declared in the
-deployment descriptor at runtime via the FilterConfig interface. -->
+<!--
+Declares a filter in the web application. The filter is mapped to either a servlet
or a URL pattern in the filter-mapping element, using the filter-name value to
reference. Filters can access the initialization parameters declared in the deployment
descriptor at runtime via the FilterConfig interface.
+-->
<!ELEMENT filter (icon?, filter-name, display-name?, description?,
-filter-class, init-param*)>
-
-<!-- The logical name of the filter. This name is used to map
-the filter. -->
+filter-class, init-param*)>
+<!--
+The logical name of the filter. This name is used to map the filter.
+-->
<!ELEMENT filter-name (#PCDATA)>
-
-<!-- The fully qualified classname of the filter. -->
+<!--
+The fully qualified classname of the filter.
+-->
<!ELEMENT filter-class (#PCDATA)>
-<!-- Declaration of the filter mappings in this web application.
-The conatiner uses the filter-mapping declarations to decide which
-filters to apply to a request, and in what order. The container
-matches the request URI to a Servlet in the normal way. To determine
-which filters to apply it matches filter-mapping declarations either
-on servlet-name, or on url-pattern for each filter-mapping element,
-depending on which style is used. The order in which filters are
-invoked is the order in which filter-mapping declarations that match
-a request URI for a servlet appear in the list of filter-mapping
-elements. The filter-name value must be the value of the filter-
-name sub-elements of one of the filter declarations in the
-deployment descriptor. -->
+<!--
+Declaration of the filter mappings in this web application. The container uses the
filter-mapping declarations to decide which filters to apply to a request, and in what
order. The container matches the request URI to a Servlet in the normal way. To
determine which filters to apply it matches filter-mapping declarations either on
servlet-name, or on url-pattern for each filter-mapping element, depending on which
style is used. The order in which filters are invoked is the order in which
filter-mapping declarations that match a request URI for a servlet appear in the list
of filter-mapping elements.The filter-name value must be the value of the
<filter-name> sub-elements of one of the <filter> declarations in the deployment
descriptor.
+-->
<!ELEMENT filter-mapping (filter-name, (url-pattern | servlet-name))>
-<!-- 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. -->
+<!--
+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. -->
+<!--
+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
+<!--
+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 -->
+<!--
+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. -->
+<!--
+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
+<!--
+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 -->
+container
+-->
<!ELEMENT distributable EMPTY>
-<!-- The context-param element contains the declaration of a web
-application's servlet context initialization parameters. -->
+<!--
+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. -->
+<!--
+The param-name element contains the name of a parameter.
+-->
<!ELEMENT param-name (#PCDATA)>
-<!-- The param-value element contains the value of a parameter. -->
+<!--
+The param-value element contains the value of a parameter.
+-->
<!ELEMENT param-value (#PCDATA)>
-<!-- The listener element indicates the deployment properties
-for a web application listener bean. -->
+<!--
+The listener element indicates the deployment properties for a web application
listener bean.
+-->
<!ELEMENT listener (listener-class)>
-<!-- The listener-class element declares a class in the application
-must be registered as a web application listener bean. -->
+<!--
+The listener-class element declares a class in the application must be registered
as a web application listener bean.
+-->
<!ELEMENT listener-class (#PCDATA)>
+
-<!-- The servlet element contains the declarative data of a
+<!--
+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. -->
+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*)>
+(servlet-class|jsp-file), init-param*, load-on-startup?, run-as?,
security-role-ref*)>
-<!-- The servlet-name element contains the canonical name of the
-servlet. -->
+<!--
+The servlet-name element contains the canonical name of the
+servlet.
+-->
<!ELEMENT servlet-name (#PCDATA)>
-<!-- The servlet-class element contains the fully qualified class name
-of the servlet. -->
+<!--
+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 beginning with a '/'. -->
+<!--
+The jsp-file element contains the full path to a JSP file within
+the web application beginning with a `/'.
+-->
<!ELEMENT jsp-file (#PCDATA)>
-<!-- The init-param element contains a name/value pair as an
-initialization param of the servlet -->
+<!--
+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
+<!--
+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. -->
+startup sequence.
+-->
<!ELEMENT load-on-startup (#PCDATA)>
-<!-- The servlet-mapping element defines a mapping between a servlet
-and a url pattern -->
+<!--
+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 11.2 of the Servlet
-API Specification. -->
+<!--
+The url-pattern element contains the url pattern of the
+mapping. Must follow the rules specified in Section 11.2 of the Servlet API
Specification.
+-->
<!ELEMENT url-pattern (#PCDATA)>
-<!-- The session-config element defines the session parameters for
-this web application. -->
+<!--
+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
+<!--
+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. -->
+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. -->
+<!--
+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" -->
+<!--
+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" -->
+<!--
+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. -->
+<!--
+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 -->
+<!--
+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. -->
+<!--
+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
+<!--
+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. -->
+Application.
+-->
<!ELEMENT taglib-uri (#PCDATA)>
-<!-- the taglib-location element contains the location (as a resource
+<!--
+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. -->
+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 -->
+<!--
+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 -->
+<!--
+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. -->
+<!--
+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 -->
+<!--
+The location element contains the location of the resource in the
+web application relative to the root of the web application. The value of the
location must have a leading `/'.
+-->
<!ELEMENT location (#PCDATA)>
+
+<!-- The resource-env-ref element contains a declaration of an component's
reference to an administered object associated with a resource in the component's
environment. It consists of an optional description, the resource environment
reference name, and an indica-tion of the resource environment reference type expected
by the component's code.
+Examples:
+<resource-env-ref>
+
-<!-- The resource-env-ref element contains a declaration of a component's
-reference to an administered object associated with a resource in the
-component's environment. It consists of an optional description, the
-resource environment reference name, and an indication of the resource
-environment reference type expected by the component's code. Examples:
- <resource-env-ref>
- <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
- <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
- </resource-env-ref>
+
+ <resource-env-ref-name>jms/StockQueue </resource-env-ref-name>
+ <resource-env-ref-type>javax.jms.Queue </resource-env-ref-type>
+</resource-env-ref>
-->
-<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
+<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
resource-env-ref-type)>
-<!-- The resource-env-ref-name element specifies the name of a
-resource environment reference; its value is the environment entry
-name used in code. -->
+<!-- The resource-env-ref-name element specifies the name of a resource environment
reference; its value is the environment entry name used in code.
+ -->
<!ELEMENT resource-env-ref-name (#PCDATA)>
-<!-- The resource-env-ref-type element specifies the type of a
-resource environment reference. Web containers in J2EE are requird
-to support javax.jms.Topic and javax.jms.Queue. -->
+<!-- The resource-env-ref-type element specifies the type of a resource environment
reference. Web containers in J2EE are required to support javax.jms.Topic and
javax.jms.Queue
+-->
<!ELEMENT resource-env-ref-type (#PCDATA)>
-<!-- The resource-ref element contains a declaration of a Web
-Application's reference to an external resource. -->
+<!--
+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,
-res-sharing-scope?)>
+<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
res-sharing-scope?)>
-<!-- The res-ref-name element specifies the name of the resource
-factory reference name. -->
+<!--
+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. -->
+<!--
+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
+<!--
+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. The allowed values are
+information supplied by the deployer. The allowed values are
<res-auth>Application</res-auth>
<res-auth>Container</res-auth>
-for those respective cases. -->
+for those respective cases.
+-->
<!ELEMENT res-auth (#PCDATA)>
-<!-- The res-sharing-scope element specifies whether connections
-obtained through the given resource manager connection factory
-reference can be shared. The value of this element, if specified,
-must be one of the two following:
- <res-sharing-scope>Shareable</res-sharing-scope>
- <res-sharing-scope>Unshareable</res-sharing-scope>
-The default value is Shareable. -->
+<!-- The res-sharing-scope element specifies whether connections obtained through
the given resource manager connection factory reference can be shared. The value of
this element, if specified, must be one of the two following:
<res-sharing-scope>Shareable</res-sharing-scope>
+<res-sharing-scope>Unshareable</res-sharing-scope> The default value is Shareable.
+-->
<!ELEMENT res-sharing-scope (#PCDATA)>
+
+<!--
+The security-constraint element is used to associate security
+constraints with one or more web resource collections
+-->
+
-<!-- The security-constraint element is used to associate security
-constraints with one or more web resource collections -->
<!ELEMENT security-constraint (display-name?, web-resource-collection+,
auth-constraint?, user-data-constraint?)>
-<!-- The web-resource-collection element is used to identify a subset
+<!--
+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. -->
+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 -->
+<!--
+The web-resource-name contains the name of this web resource
+collection
+-->
<!ELEMENT web-resource-name (#PCDATA)>
-<!-- The http-method contains an HTTP method (GET | POST |...) -->
+<!--
+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 -->
+<!--
+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
+<!--
+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
@@ -324,162 +384,212 @@
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. -->
+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
+<!--
+The auth-constraint element indicates the user roles that should
be permitted access to this resource collection. The role used here
-must either appear in a security-role-ref element, or be the specially
-reserved role-name "*" that is a compact syntax for indicating all
-roles in the web application. If both "*" and rolenames appear, the
-container interprets this as all roles. -->
+must either in a security-role-ref element, or be the specially reserved role-name
"*" that is a compact syntax for indicating all roles in the web application. If both
"*" and rolenames appear, the container interprets this as all roles.
+-->
<!ELEMENT auth-constraint (description?, role-name*)>
-<!-- The role-name element contains the name of a security role. -->
+<!--
+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
+<!--
+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. -->
+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 -->
+<!--
+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
+<!--
+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. -->
+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 -->
+<!--
+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
+<!--
+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 -->
+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
+<!--
+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". -->
+"FORM", or "CLIENT-CERT".
+-->
<!ELEMENT auth-method (#PCDATA)>
-<!-- The security-role element contains the declaration of a security
+<!--
+The security-role element contains the declaration of a security
role which is used in the security-constraints placed on the web
-application. -->
+application.
+-->
<!ELEMENT security-role (description?, role-name)>
+
+<!--
+The security-role-ref element defines a mapping between the name of role called
from a Servlet using
+isUserInRole(String name) and the name of a security role defined for the web
application. For example,
+to map the security role reference "FOO" to the security role with role-name
"manager" the sytax would
+be:
-<!-- The security-role-ref element defines a mapping between the name
-of a role called from a Servlet using isUserInRole(String name) and the
-name of a security role defined for the web application. For example,
-to map the security role reference "FOO" to the security role with the
-role-name "manager", the syntax would be:
- <security-role-ref>
- <role-name>FOO</role-name>
- <role-link>manager</role-link>
- </security-role-ref>
-In this case if the servlet called by a user belonging to the "manager"
-security role made the API call isUserInRole("FOO") the result would be true.
-Since the role-name "*" has a special meaning for authorization constraints,
-its value is not permitted here. -->
+<security-role-ref>
+
-<!ELEMENT security-role-ref (description?, role-name, role-link)>
-<!-- The role-link element is used to link a security role reference
+
+<role-name>FOO</role-name>
+
+<role-link>manager</manager>
+</security-role-ref>
+
+In this case if the servlet called by a user belonging to the "manager" security
role made the API call
+isUserInRole("FOO") the result would be true.
+Since the role-name "*" has a special meaning for authorization constraints, its
value is not permitted here.
+-->
+
+<!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. -->
+elements.
+-->
<!ELEMENT role-link (#PCDATA)>
-<!-- The env-entry element contains the declaration of an
+<!--
+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. -->
+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 -->
+<!--
+The env-entry-name contains the name of an application's
+environment entry
+-->
<!ELEMENT env-entry-name (#PCDATA)>
-<!-- The env-entry-value element contains the value of an
-application's environment entry -->
+<!--
+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
+<!--
+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. -->
+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. -->
+<!--
+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?, run-as?)>
+<!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
+<!--
+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. -->
+reference to the enterprise bean.
+-->
<!ELEMENT ejb-ref-name (#PCDATA)>
+
+<!-- The ejb-ref-type element contains the expected type of the referenced
enterprise bean. The ejb-ref-type element must be one of the following:
-<!-- The ejb-ref-type element contains the expected java class type of
-the referenced EJB. -->
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <ejb-ref-type>Session</ejb-ref-type>
+-->
<!ELEMENT ejb-ref-type (#PCDATA)>
-<!-- The ejb-home element contains the fully qualified name of the
-EJB's home interface -->
+<!--
+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 -->
+<!--
+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
+<!--
+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. -->
+application package.
+-->
<!ELEMENT ejb-link (#PCDATA)>
-<!-- The runAs element must contain the name of a security role
-defined for this web application. -->
+<!--
+The run-as element must contain the name of a security role defined for this web
application. If the optional run-as element is used for a servlet definition, the
security identity of a call to any EJBs from the servlet must be propogated as the
security role with the same name.
+
+-->
+
<!ELEMENT run-as (#PCDATA)>
-<!-- The ID mechanism is to allow tools to easily make tool-specific
+
+<!--
+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. -->
+deployment descriptor.
+-->
<!ATTLIST web-app id ID #IMPLIED>
<!ATTLIST filter id ID #IMPLIED>
@@ -554,4 +664,4 @@
<!ATTLIST home id ID #IMPLIED>
<!ATTLIST remote id ID #IMPLIED>
<!ATTLIST ejb-link id ID #IMPLIED>
-<!ATTLIST run-as iid ID #IMPLIED>
+<!ATTLIST run-as id ID #IMPLIED>
