You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2006/11/21 18:45:46 UTC
svn commit: r477783 -
/geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.2.xsd
Author: akulshreshtha
Date: Tue Nov 21 09:45:45 2006
New Revision: 477783
URL: http://svn.apache.org/viewvc?view=rev&rev=477783
Log:
GERONIMO-2542 Fixed namespace, patch by Jay D. McHugh
Modified:
geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.2.xsd
Modified: geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.2.xsd?view=diff&rev=477783&r1=477782&r2=477783
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.2.xsd (original)
+++ geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.2.xsd Tue Nov 21 09:45:45 2006
@@ -36,48 +36,48 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
<xs:element name="web-app" type="web:web-appType"/>
- <xsd:annotation>
- <xsd:documentation>
- The web-app element is the root of the deployment descriptor for a Geronimo web
- application. Note that the sub-elements of this element should be as in the given order because it is
- defined as a sequence.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:annotation>
- <xsd:documentation>
-
- This group keeps the usage of the contained JNDI environment
- reference elements consistent across J2EE deployment descriptors.
-
- </xsd:documentation>
- </xsd:annotation>
+ <xs:annotation>
+ <xs:documentation>
+ The web-app element is the root of the deployment descriptor for a Geronimo web
+ application. Note that the sub-elements of this element should be as in the given order because it is
+ defined as a sequence.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:annotation>
+ <xs:documentation>
+ This group keeps the usage of the contained JNDI environment
+ reference elements consistent across J2EE deployment descriptors.
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType name="web-appType">
<xs:sequence>
- <xs:element ref="sys:environment" minOccurs="0"/>
- <xsd:annotation>
- <xsd:documentation>
- This is the first part of the URL used to access the web application.
- For example context-root of "Sample-App" will have URL of
- http://host:port/Sample-App" and a context-root of "/" would be make this the default web application to the server.
-
- If the web application is packaged as an EAR that can use application context
- in the "application.xml". This element is necessary unless you want context root to default to the WAR
- name.
- </xsd:documentation>
- </xsd:annotation>
+ <xs:element ref="sys:environment" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ This is the first part of the URL used to access the web application.
+ For example context-root of "Sample-App" will have URL of
+ http://host:port/Sample-App" and a context-root of "/" would be make this the default web application to the server.
+
+ If the web application is packaged as an EAR that can use application context
+ in the "application.xml". This element is necessary unless you want context root to default to the WAR
+ name.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="context-root" type="xs:string" minOccurs="0"/>
<!--<xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>-->
<xs:element ref="naming:web-container" minOccurs="0"/>
- <xs:element name="container-config" type="web:container-configType" minOccurs="0"/>
- <xsd:annotation>
- <xsd:documentation>
- Geronimo supports both Jetty and Tomcat web containers. This element is
- for a web application needs to take container specific settings. It can hold either a Tomcat element or a Jetty element or both.
- </xsd:documentation>
- </xsd:annotation>
+ <xs:element name="container-config" type="web:container-configType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ Geronimo supports both Jetty and Tomcat web containers. This element is
+ for a web application needs to take container specific settings. It can hold either a Tomcat element or a Jetty element or both.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:group ref="naming:jndiEnvironmentRefsGroup"/>
<xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>