geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r417369 [6/8] - in /geronimo/sandbox/servlet-2.5: ./ etc/ modules/client-builder/src/java/org/apache/geronimo/client/builder/ modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ modules/j2ee-builder/src/java/org/apa...
Date Tue, 27 Jun 2006 08:13:13 GMT
Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd?rev=417369&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd (added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd Tue Jun 27 01:13:10 2006
@@ -0,0 +1,1143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+     targetNamespace="http://java.sun.com/xml/ns/javaee"
+     xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="2.1">
+
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)web-jsptaglibrary_2_1.xsds	1.1
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003-2006 Sun Microsystems, Inc.
+      4150 Network Circle
+      Santa Clara, California 95054
+      U.S.A
+      All rights reserved.
+
+      Sun Microsystems, Inc. has intellectual property rights
+      relating to technology described in this document. In
+      particular, and without limitation, these intellectual
+      property rights may include one or more of the U.S. patents
+      listed at http://www.sun.com/patents and one or more
+      additional patents or pending patent applications in the
+      U.S. and other countries.
+
+      This document and the technology which it describes are
+      distributed under licenses restricting their use, copying,
+      distribution, and decompilation. No part of this document
+      may be reproduced in any form by any means without prior
+      written authorization of Sun and its licensors, if any.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+      Cup logo are trademarks or registered trademarks of Sun
+      Microsystems, Inc. in the U.S. and other countries.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
+
+	This is the XML Schema for the JSP Taglibrary
+	descriptor.  All Taglibrary descriptors must
+	indicate the tag library schema by using the Taglibrary
+	namespace:
+
+	http://java.sun.com/xml/ns/javaee
+
+	and by indicating the version of the schema by
+	using the version element as shown below:
+
+	    <taglib xmlns="http://java.sun.com/xml/ns/javaee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="..."
+	      version="2.1">
+	      ...
+	    </taglib>
+
+	The instance documents may indicate the published
+	version of the schema using xsi:schemaLocation attribute
+	for Java EE namespace with the following location:
+
+	http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="javaee_5.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:element name="taglib" type="javaee:tldTaglibType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The taglib tag is the document root.
+	The definition of taglib is provided
+	by the tldTaglibType.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:unique name="tag-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The taglib element contains, among other things, tag and
+	  tag-file elements.
+	  The name subelements of these elements must each be unique.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:tag|javaee:tag-file"/>
+      <xsd:field    xpath="javaee:name"/>
+    </xsd:unique>
+
+    <xsd:unique name="function-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The taglib element contains function elements.
+	  The name subelements of these elements must each be unique.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:function"/>
+      <xsd:field    xpath="javaee:name"/>
+    </xsd:unique>
+
+  </xsd:element>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="body-contentType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        Specifies the type of body that is valid for a tag.
+	This value is used by the JSP container to validate
+	that a tag invocation has the correct body syntax and
+	by page composition tools to assist the page author
+	in providing a valid tag body.
+
+	There are currently four values specified:
+
+	tagdependent    The body of the tag is interpreted by the tag
+			implementation itself, and is most likely
+			in a different "language", e.g embedded SQL
+			statements.
+
+	JSP             The body of the tag contains nested JSP
+			syntax.
+
+	empty           The body must be empty
+
+	scriptless      The body accepts only template text, EL
+			Expressions, and JSP action elements.  No
+			scripting elements are allowed.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="tagdependent"/>
+	<xsd:enumeration value="JSP"/>
+	<xsd:enumeration value="empty"/>
+	<xsd:enumeration value="scriptless"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="extensibleType" abstract="true">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The extensibleType is an abstract base type that is used to
+	define the type of extension-elements. Instance documents
+	must substitute a known type to define the extension by
+	using xsi:type attribute to define the actual type of
+	extension-elements.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="functionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The function element is used to provide information on each
+	function in the tag library that is to be exposed to the EL.
+
+	The function element may have several subelements defining:
+
+	description         Optional tag-specific information
+
+	display-name        A short name that is intended to be
+			    displayed by tools
+
+	icon                Optional icon element that can be used
+			    by tools
+
+	name                A unique name for this function
+
+	function-class      Provides the name of the Java class that
+			    implements the function
+
+	function-signature  Provides the signature, as in the Java
+			    Language Specification, of the Java
+			    method that is to be used to implement
+			    the function.
+
+	example             Optional informal description of an
+			    example of a use of this function
+
+	function-extension  Zero or more extensions that provide extra
+			    information about this function, for tool
+			    consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="name"
+		   type="javaee:tld-canonical-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    A unique name for this function.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="function-class"
+		   type="javaee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Provides the fully-qualified class name of the Java
+	    class containing the static method that implements
+	    the function.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="function-signature"
+		   type="javaee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Provides the signature, of the static Java method that is
+	    to be used to implement the function.  The syntax of the
+	    function-signature element is as follows:
+
+		FunctionSignature ::= ReturnType S MethodName S?
+				      '(' S? Parameters? S? ')'
+
+                ReturnType        ::= Type
+
+		MethodName        ::= Identifier
+
+		Parameters        ::=   Parameter
+				      | ( Parameter S? ',' S? Parameters )
+
+                Parameter         ::= Type
+
+		Where:
+
+ 		    * Type is a basic type or a fully qualified
+		      Java class name (including package name),
+		      as per the 'Type' production in the Java
+		      Language Specification, Second Edition,
+		      Chapter 18.
+
+                    * Identifier is a Java identifier, as per
+		      the 'Identifier' production in the Java
+		      Language Specification, Second
+		      Edition, Chapter 18.
+
+	    Example:
+
+	    java.lang.String nickName( java.lang.String, int )
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="example"
+		   type="javaee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The example element contains an informal description
+	    of an example of the use of this function.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="function-extension"
+		   type="javaee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Function extensions are for tool use only and must not
+            affect the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tagFileType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Defines an action in this tag library that is implemented
+	as a .tag file.
+
+	The tag-file element has two required subelements:
+
+	description       Optional tag-specific information
+
+	display-name      A short name that is intended to be
+			  displayed by tools
+
+	icon              Optional icon element that can be used
+			  by tools
+
+	name              The unique action name
+
+	path              Where to find the .tag file implementing this
+			  action, relative to the root of the web
+			  application or the root of the JAR file for a
+			  tag library packaged in a JAR.  This must
+			  begin with /WEB-INF/tags if the .tag file
+			  resides in the WAR, or /META-INF/tags if the
+			  .tag file resides in a JAR.
+
+	example           Optional informal description of an
+			  example of a use of this tag
+
+	tag-extension     Zero or more extensions that provide extra
+			  information about this tag, for tool
+			  consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="name"
+		   type="javaee:tld-canonical-nameType"/>
+      <xsd:element name="path"
+		   type="javaee:pathType"/>
+      <xsd:element name="example"
+		   type="javaee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The example element contains an informal description
+	    of an example of the use of a tag.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="tag-extension"
+		   type="javaee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Tag extensions are for tool use only and must not affect
+	    the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tagType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The tag defines a unique tag in this tag library.  It has one
+	attribute, id.
+
+	The tag element may have several subelements defining:
+
+	description       Optional tag-specific information
+
+	display-name      A short name that is intended to be
+			  displayed by tools
+
+	icon              Optional icon element that can be used
+			  by tools
+
+	name              The unique action name
+
+	tag-class         The tag handler class implementing
+			  javax.servlet.jsp.tagext.JspTag
+
+	tei-class         An optional subclass of
+			  javax.servlet.jsp.tagext.TagExtraInfo
+
+	body-content      The body content type
+
+	variable          Optional scripting variable information
+
+	attribute         All attributes of this action that are
+			  evaluated prior to invocation.
+
+	dynamic-attributes Whether this tag supports additional
+			   attributes with dynamic names.  If
+			   true, the tag-class must implement the
+			   javax.servlet.jsp.tagext.DynamicAttributes
+			   interface.  Defaults to false.
+
+	example           Optional informal description of an
+			  example of a use of this tag
+
+	tag-extension     Zero or more extensions that provide extra
+			  information about this tag, for tool
+			  consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="name"
+		   type="javaee:tld-canonical-nameType"/>
+      <xsd:element name="tag-class"
+		   type="javaee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the subclass of javax.serlvet.jsp.tagext.JspTag
+	    that implements the request time semantics for
+	    this tag. (required)
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="tei-class"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    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.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="body-content"
+		   type="javaee:body-contentType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Specifies the format for the body of this tag.
+	    The default in JSP 1.2 was "JSP" but because this
+	    is an invalid setting for simple tag handlers, there
+	    is no longer a default in JSP 2.0.  A reasonable
+	    default for simple tag handlers is "scriptless" if
+	    the tag can have a body.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="variable"
+		   type="javaee:variableType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="attribute"
+		   type="javaee:tld-attributeType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="dynamic-attributes"
+		   type="javaee:generic-booleanType"
+		   minOccurs="0"/>
+      <xsd:element name="example"
+		   type="javaee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The example element contains an informal description
+	    of an example of the use of a tag.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="tag-extension"
+		   type="javaee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Tag extensions are for tool use only and must not affect
+	    the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-attributeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The attribute element defines an attribute for the nesting
+	tag.  The attribute element may have several subelements
+	defining:
+
+	description     a description of the attribute
+
+	name            the name of the attribute
+
+	required        whether the attribute is required or
+			optional
+
+	rtexprvalue     whether the attribute is a runtime attribute
+
+	type            the type of the attributes
+
+	fragment        whether this attribute is a fragment
+
+        deferred-value  present if this attribute is to be parsed as a
+                        javax.el.ValueExpression
+
+        deferred-method present if this attribute is to be parsed as a
+                        javax.el.MethodExpression
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="name"
+		   type="javaee:java-identifierType"/>
+      <xsd:element name="required"
+		   type="javaee:generic-booleanType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines if the nesting attribute is required or
+	    optional.
+
+	    If not present then the default is "false", i.e
+	    the attribute is optional.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:choice>
+	<xsd:sequence>
+          <xsd:sequence minOccurs="0">
+	    <xsd:element name="rtexprvalue"
+		         type="javaee:generic-booleanType">
+	      <xsd:annotation>
+	        <xsd:documentation>
+
+		  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.
+		  If not present then the default is "false", i.e the
+		  attribute has a static value
+
+	        </xsd:documentation>
+	      </xsd:annotation>
+	    </xsd:element>
+	    <xsd:element name="type"
+		         type="javaee:fully-qualified-classType"
+		         minOccurs="0">
+	      <xsd:annotation>
+	        <xsd:documentation>
+
+		  Defines the Java type of the attributes value.
+                  If this element is omitted, the expected type is
+                  assumed to be "java.lang.Object".
+
+	        </xsd:documentation>
+	      </xsd:annotation>
+	    </xsd:element>
+	  </xsd:sequence>
+
+          <xsd:choice>
+	    <xsd:element name="deferred-value"
+		         type="javaee:tld-deferred-valueType"
+		         minOccurs="0">
+	      <xsd:annotation>
+	        <xsd:documentation>
+
+                  Present if the value for this attribute is to be
+                  passed to the tag handler as a
+                  javax.el.ValueExpression. This allows for deferred
+                  evaluation of EL expressions. An optional subelement
+                  will contain the expected type that the value will
+                  be coerced to after evaluation of the expression.
+                  The type defaults to Object if one is not provided.
+
+	        </xsd:documentation>
+	      </xsd:annotation>
+	    </xsd:element>
+	    <xsd:element name="deferred-method"
+		       type="javaee:tld-deferred-methodType"
+		       minOccurs="0">
+	      <xsd:annotation>
+	        <xsd:documentation>
+
+                Present if the value for this attribute is to be
+                passed to the tag handler as a
+                javax.el.MethodExpression. This allows for deferred
+                evaluation of an EL expression that identifies a
+                method to be invoked on an Object. An optional
+                subelement will contain the expected method
+                signature. The signature defaults to "void method()"
+                if one is not provided.
+
+	        </xsd:documentation>
+	      </xsd:annotation>
+	    </xsd:element>
+          </xsd:choice>
+        </xsd:sequence>
+
+	<xsd:element name="fragment"
+		     type="javaee:generic-booleanType"
+		     minOccurs="0">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      "true" if this attribute is of type
+	      javax.jsp.tagext.JspFragment, representing dynamic
+	      content that can be re-evaluated as many times
+	      as needed by the tag handler.  If omitted or "false",
+	      the default is still type="java.lang.String"
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-canonical-nameType">
+
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Defines the canonical name of a tag or attribute being
+	defined.
+
+	The name must conform to the lexical rules for an NMTOKEN.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:xsdNMTOKENType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-deferred-methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        Defines information about how to provide the value for a
+        tag handler attribute that accepts a javax.el.MethodExpression.
+
+	The deferred-method element has one optional subelement:
+
+	method-signature  Provides the signature, as in the Java
+                          Language Specifies, that is expected for
+                          the method being identified by the
+                          expression.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="method-signature"
+                   type="javaee:string"
+                   minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>
+
+            Provides the expected signature of the method identified
+            by the javax.el.MethodExpression.
+
+            This disambiguates overloaded methods and ensures that
+            the return value is of the expected type.
+
+            The syntax of the method-signature element is identical
+            to that of the function-signature element.  See the
+            documentation for function-signature for more details.
+
+	    The name of the method is for documentation purposes only
+	    and is ignored by the JSP container.
+
+            Example:
+
+              boolean validate(java.lang.String)
+
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-deferred-valueType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        Defines information about how to provide the value for a
+        tag handler attribute that accepts a javax.el.ValueExpression.
+
+	The deferred-value element has one optional subelement:
+
+	type            the expected type of the attribute
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="type"
+                   type="javaee:fully-qualified-classType"
+                   minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>
+
+            The fully-qualified name of the Java type that is the
+            expected type for this deferred expression.  If this
+            element is omitted, the expected type is assumed to be
+            "java.lang.Object".
+
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-extensionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The tld-extensionType is used to indicate
+	extensions to a specific TLD element.
+
+	It is used by elements to designate an extension block
+	that is targeted to a specific extension designated by
+	a set of extension elements that are declared by a
+	namespace. The namespace identifies the extension to
+	the tool that processes the extension.
+
+	The type of the extension-element is abstract. Therefore,
+	a concrete type must be specified by the TLD using
+	xsi:type attribute for each extension-element.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="extension-element"
+		   type="javaee:extensibleType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="namespace"
+		   use="required"
+		   type="xsd:anyURI"/>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tldTaglibType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The taglib tag is the document root, it defines:
+
+	description     a simple string describing the "use" of this
+			taglib, should be user discernable
+
+	display-name    the display-name element contains a
+			short name that is intended to be displayed
+			by tools
+
+	icon            optional icon that can be used by tools
+
+	tlib-version    the version of the tag library implementation
+
+	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
+
+	validator       optional TagLibraryValidator information
+
+	listener        optional event listener specification
+
+	tag             tags in this tag library
+
+	tag-file        tag files in this tag library
+
+	function        zero or more EL functions defined in this
+			tag library
+
+	taglib-extension zero or more extensions that provide extra
+			information about this taglib, for tool
+			consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="tlib-version"
+		   type="javaee:dewey-versionType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Describes this version (number) of the taglibrary.
+	    It is described as a dewey decimal.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+
+      <xsd:element name="short-name"
+		   type="javaee:tld-canonical-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a simple default name that could be used by
+	    a JSP authoring tool to create names with a
+	    mnemonicvalue; for example, it may be used as the
+	    preferred prefix value in taglib directives.  Do
+	    not use white space, and do not start with digits
+	    or underscore.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="uri"
+		   type="javaee:xsdAnyURIType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a public URI that uniquely identifies this
+	    version of the taglibrary.  Leave it empty if it
+	    does not apply.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="validator"
+		   type="javaee:validatorType"
+		   minOccurs="0">
+      </xsd:element>
+      <xsd:element name="listener"
+		   type="javaee:listenerType"
+		   minOccurs="0" maxOccurs="unbounded">
+      </xsd:element>
+      <xsd:element name="tag"
+		   type="javaee:tagType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="tag-file"
+		   type="javaee:tagFileType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="function"
+		   type="javaee:functionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="taglib-extension"
+		   type="javaee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Taglib extensions are for tool use only and must not
+            affect the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="javaee:dewey-versionType"
+		   fixed="2.1"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  Describes the JSP version (number) this taglibrary
+	  requires in order to function (dewey decimal)
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="validatorType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	A validator that can be used to validate
+	the conformance of a JSP page to using this tag library is
+	defined by a validatorType.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="validator-class"
+		   type="javaee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the TagLibraryValidator class that can be used
+	    to validate the conformance of a JSP page to using this
+	    tag library.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="init-param"
+		   type="javaee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The init-param element contains a name/value pair as an
+	    initialization param.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="variable-scopeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type defines scope of the scripting variable.  See
+	TagExtraInfo for details.  The allowed values are,
+	"NESTED", "AT_BEGIN" and "AT_END".
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="javaee:string">
+	<xsd:enumeration value="NESTED"/>
+	<xsd:enumeration value="AT_BEGIN"/>
+	<xsd:enumeration value="AT_END"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="variableType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The variableType provides information on the scripting
+	variables defined by using 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 value from a call to getVariableInfo().
+
+	The subelements of variableType are of the form:
+
+	description              Optional description of this
+				 variable
+
+	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.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="javaee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="name-given"
+		     type="javaee:java-identifierType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The name for the scripting variable.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="name-from-attribute"
+		     type="javaee:java-identifierType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The name of an attribute whose
+	      (translation-time) value will give the name of
+	      the variable.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+      <xsd:element name="variable-class"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The optional name of the class for the scripting
+	    variable.  The default is java.lang.String.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+
+      <xsd:element name="declare"
+		   type="javaee:generic-booleanType"
+		   minOccurs="0">
+
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Whether the scripting variable is to be defined
+	    or not.  See TagExtraInfo for details.  This
+	    element is optional and "true" is the default.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="scope"
+		   type="javaee:variable-scopeType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The element is optional and "NESTED" is the default.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+</xsd:schema>
+

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd?rev=417369&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd (added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd Tue Jun 27 01:13:10 2006
@@ -0,0 +1,87 @@
+<?xml version='1.0'?>
+
+<!--
+ Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+-->
+
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   See http://www.w3.org/XML/1998/namespace.html and
+   http://www.w3.org/TR/REC-xml for information about this namespace.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
+        suitable for use by
+        schemas wishing to allow xml:base, xml:lang or xml:space attributes
+        on elements they define.
+
+        To enable this, such a schema must import this schema
+        for the XML namespace, e.g. as follows:
+        &lt;schema . . .>
+         . . .
+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
+
+        Subsequently, qualified reference to any of the attributes
+        or the group defined below will have the desired effect, e.g.
+
+        &lt;type . . .>
+         . . .
+         &lt;attributeGroup ref="xml:specialAttrs"/>
+ 
+         will define a type which will schema-validate an instance
+         element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
+   policy, this schema document will persist at
+   http://www.w3.org/2001/03/xml.xsd.
+   At the date of issue it can also be found at
+   http://www.w3.org/2001/xml.xsd.
+   The schema document at that URI may however change in the future,
+   in order to remain compatible with the latest version of XML Schema
+   itself.  In other words, if the XML Schema namespace changes, the version
+   of this document at
+   http://www.w3.org/2001/xml.xsd will change
+   accordingly; the version at
+   http://www.w3.org/2001/03/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values . . .</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/web-1-25.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/web-1-25.xml?rev=417369&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/web-1-25.xml (added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/web-1-25.xml Tue Jun 27 01:13:10 2006
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+  <description>no description</description>
+  <display-name>display name</display-name>
+  <servlet>
+    <description>no description</description>
+    <display-name>servlet display name</display-name>
+    <servlet-name>servletname</servlet-name>
+    <servlet-class>com.nowhere.Servlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>servletname</servlet-name>
+    <url-pattern>/urlPattern</url-pattern>
+  </servlet-mapping>
+  <session-config>
+    <session-timeout>60</session-timeout>
+  </session-config>
+</web-app>
+

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/web-1-25.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/web-1-25.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_2dtd/web-1-25.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-1-25.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-1-25.xml?rev=417369&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-1-25.xml (added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-1-25.xml Tue Jun 27 01:13:10 2006
@@ -0,0 +1,36 @@
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+    <servlet>
+        <description>MVC Servlet for Jetspeed Portlet Applications</description>
+        <display-name>Jetspeed Container</display-name>
+        <servlet-name>JetspeedContainer</servlet-name>
+        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+        <init-param>
+            <param-name>registerAtInit</param-name>
+            <param-value>1</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portletApplication</param-name>
+            <param-value>RssPortlet-enhanced</param-value>
+        </init-param>
+        <load-on-startup>100</load-on-startup>
+    </servlet>
+    <servlet>
+        <description>MVC Servlet for Jetspeed Portlet Applications</description>
+        <display-name>Jetspeed Container</display-name>
+        <servlet-name>JetspeedContainer2</servlet-name>
+        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+        <init-param>
+            <param-name>registerAtInit</param-name>
+            <param-value>1</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portletApplication</param-name>
+            <param-value>RssPortlet-enhanced</param-value>
+        </init-param>
+        <load-on-startup>100</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>JetspeedContainer</servlet-name>
+        <url-pattern>/container/*</url-pattern>
+    </servlet-mapping>
+</web-app>

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-1-25.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-1-25.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-1-25.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-25.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-25.xml?rev=417369&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-25.xml (added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-25.xml Tue Jun 27 01:13:10 2006
@@ -0,0 +1,123 @@
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+  <description>WebAppDescription</description>
+  <display-name>WebAppDisplayName</display-name>
+  <icon>
+    <small-icon>small</small-icon>
+    <large-icon>large</large-icon>
+  </icon>
+  <distributable/>
+    <context-param>
+        <description>description1</description>
+        <param-name>param1</param-name>
+        <param-value>value1</param-value>
+    </context-param>
+    <context-param>
+        <description>description2</description>
+        <param-name>param2</param-name>
+        <param-value>value2</param-value>
+    </context-param>
+  <filter>
+    <description>filterDescription</description>
+    <display-name>displayName</display-name>
+    <icon>
+      <small-icon>small</small-icon>
+      <large-icon>large</large-icon>
+    </icon>
+    <filter-name>filterName</filter-name>
+    <filter-class>MyClass</filter-class>
+    <init-param>
+      <description>initDescription</description>
+      <param-name>paramName</param-name>
+      <param-value>value</param-value>
+    </init-param>
+  </filter>
+  <servlet>
+    <description>ServletDescription</description>
+    <display-name>servletDisplayName</display-name>
+    <icon>
+      <small-icon>smallServlet</small-icon>
+      <large-icon>largeServlet</large-icon>
+    </icon>
+    <servlet-name>myServlet</servlet-name>
+    <servlet-class>MyServletClass</servlet-class>
+    <init-param>
+      <description>description</description>
+      <param-name>paramName</param-name>
+      <param-value>value</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+    <run-as>
+      <role-name>me</role-name>
+    </run-as>
+  </servlet>
+  <servlet>
+    <description>ServletDescription</description>
+    <display-name>servletDisplayName</display-name>
+    <servlet-name>myOtherServlet</servlet-name>
+    <servlet-class>MyServletClass</servlet-class>
+    <init-param>
+      <description>description</description>
+      <param-name>paramName</param-name>
+      <param-value>value</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+    <run-as>
+      <role-name>me</role-name>
+    </run-as>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>LoginServlet</servlet-name>
+    <url-pattern>/login</url-pattern>
+  </servlet-mapping>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/tld/struts-bean.tld</taglib-uri>
+      <taglib-location>/WEB-INF/tld/struts-bean-1.1.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/tld/struts-html.tld</taglib-uri>
+      <taglib-location>/WEB-INF/tld/struts-html-1.1.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/tld/struts-logic.tld</taglib-uri>
+      <taglib-location>/WEB-INF/tld/struts-logic-1.1.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>/WEB-INF/tld/struts-tiles.tld</taglib-uri>
+      <taglib-location>/WEB-INF/tld/struts-tiles-1.1.tld</taglib-location>
+    </taglib>
+  </jsp-config>
+  <servlet-mapping>
+    <servlet-name>LoginServlet</servlet-name>
+    <url-pattern>/login-error</url-pattern>
+  </servlet-mapping>
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Secured Content</web-resource-name>
+      <description>Require users to authenticate</description>
+      <url-pattern>/secure/*</url-pattern>
+      <url-pattern>/servlets/*</url-pattern>
+      <http-method>POST</http-method>
+      <http-method>GET</http-method>
+    </web-resource-collection>
+    <auth-constraint>
+      <description>Only allow Authenticated Users role</description>
+      <role-name>Users</role-name>
+    </auth-constraint>
+    <user-data-constraint>
+      <description>Encryption is not required for the application in general.</description>
+      <transport-guarantee>NONE</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+  <login-config>
+    <auth-method>FORM</auth-method>
+    <form-login-config>
+      <form-login-page>/login</form-login-page>
+      <form-error-page>/login-error</form-error-page>
+    </form-login-config>
+  </login-config>
+  <security-role>
+    <description>Users</description>
+    <role-name>Users</role-name>
+  </security-role>
+</web-app>

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-25.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-25.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-25.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-1-25.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-1-25.xml?rev=417369&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-1-25.xml (added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-1-25.xml Tue Jun 27 01:13:10 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+    <servlet>
+        <display-name>Jetspeed Container</display-name>
+        <description>MVC Servlet for Jetspeed Portlet Applications</description>
+        <servlet-name>JetspeedContainer</servlet-name>
+        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+        <init-param>
+            <param-name>registerAtInit</param-name>
+            <param-value>1</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portletApplication</param-name>
+            <param-value>RssPortlet-enhanced</param-value>
+        </init-param>
+        <load-on-startup>100</load-on-startup>
+    </servlet>
+    <servlet>
+        <display-name>Jetspeed Container</display-name>
+        <description>MVC Servlet for Jetspeed Portlet Applications</description>
+        <servlet-name>JetspeedContainer2</servlet-name>
+        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+        <init-param>
+            <param-name>registerAtInit</param-name>
+            <param-value>1</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portletApplication</param-name>
+            <param-value>RssPortlet-enhanced</param-value>
+        </init-param>
+        <load-on-startup>100</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>JetspeedContainer</servlet-name>
+        <url-pattern>/container/*</url-pattern>
+    </servlet-mapping>
+</web-app>

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-1-25.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-1-25.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-1-25.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-2-25.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-2-25.xml?rev=417369&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-2-25.xml (added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-2-25.xml Tue Jun 27 01:13:10 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <display-name>naming itest</display-name>
+    <servlet>
+        <servlet-name>NamingTestServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.itests.naming.war.NamingTestServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>NamingTestServlet</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+
+    <service-ref>
+        <service-ref-name>service/InteropLab</service-ref-name>
+        <service-interface>org.apache.geronimo.itests.naming.common.webservice.interop.InteropLab</service-interface>
+        <wsdl-file>WEB-INF/wsdl/interop.wsdl</wsdl-file>
+        <jaxrpc-mapping-file>WEB-INF/wsdl/interop-jaxrpcmapping.xml</jaxrpc-mapping-file>
+        <service-qname xmlns:interop="http://tempuri.org/4s4c/1/3/wsdl/def/interopLab">interop:interopLab</service-qname>
+    </service-ref>
+</web-app>

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-2-25.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-2-25.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test-data/javaee_5schema/web-2-25.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Tue Jun 27 01:13:10 2006
@@ -58,7 +58,7 @@
     //I've taken option (1) and fixed the schemas
 
     //The schemas have been fixed by sun, we can use the official schemas.
-
+/*
     public void testApplicationClient13ToApplicationClient14Transform() throws Exception {
         URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-client-13.xml");
         URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-14.xml");
@@ -316,10 +316,10 @@
         boolean ok = compareXmlObjects(srcObject, expected, problems);
         assertTrue("Differences: " + problems, ok);
     }
-
-    public void testWeb23To24Transform() throws Exception {
+*/
+    public void testWeb23To25Transform() throws Exception {
         URL srcXml = classLoader.getResource("j2ee_1_3dtd/web-23.xml");
-        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-24.xml");
+        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-25.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
@@ -333,9 +333,9 @@
         assertTrue("Differences: " + problems, ok2);
     }
 
-    public void testWeb23To24OtherTransform() throws Exception {
+    public void testWeb23To25OtherTransform() throws Exception {
         URL srcXml = classLoader.getResource("j2ee_1_3dtd/web-1-23.xml");
-        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-1-24.xml");
+        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/web-1-25.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
 //        System.out.println(xmlObject.toString());
@@ -348,9 +348,9 @@
         assertTrue("Differences: " + problems, ok2);
     }
 
-    public void testWeb22To24Transform1() throws Exception {
+    public void testWeb22To25Transform1() throws Exception {
         URL srcXml = classLoader.getResource("j2ee_1_2dtd/web-1-22.xml");
-        URL expectedOutputXml = classLoader.getResource("j2ee_1_2dtd/web-1-24.xml");
+        URL expectedOutputXml = classLoader.getResource("j2ee_1_2dtd/web-1-25.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
@@ -364,23 +364,23 @@
         assertTrue("Differences: " + problems, ok2);
     }
 
-    public void testWebRejectBad24() throws Exception {
-        URL srcXml = classLoader.getResource("j2ee_1_4schema/web-1-24.xml");
+    public void testWebRejectBad25() throws Exception {
+        URL srcXml = classLoader.getResource("javaee_5schema/web-1-25.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         try {
             xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
-            fail("doc src/test-data/j2ee_1_4schema/web-1-24.xml is invalid, should not have validated");
+            fail("doc src/test-data/javaee_5schema/web-1-25.xml is invalid, should not have validated");
         } catch (XmlException e) {
             //expected
         }
     }
 
-    public void testParseWeb24() throws Exception {
-        URL srcXml = classLoader.getResource("j2ee_1_4schema/web-2-24.xml");
+    public void testParseWeb25() throws Exception {
+        URL srcXml = classLoader.getResource("javaee_5schema/web-2-25.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
     }
-
+/*
     public void testEJB21To21DoesNothing() throws Exception {
         URL srcXml = classLoader.getResource("j2ee_1_4schema/ejb-jar.xml");
         URL expectedOutputXml = classLoader.getResource("j2ee_1_4schema/ejb-jar.xml");
@@ -392,6 +392,7 @@
         assertTrue("Differences: " + problems, ok);
     }
 
+*/
     public void testGeronimoNamingNamespaceChange() throws Exception {
         URL srcXml = classLoader.getResource("geronimo/ejb-naming-pre.xml");
         URL expectedOutputXml = classLoader.getResource("geronimo/ejb-naming-post.xml");

Modified: geronimo/sandbox/servlet-2.5/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty-builder/project.xml?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty-builder/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty-builder/project.xml Tue Jun 27 01:13:10 2006
@@ -235,7 +235,17 @@
 
         <dependency>
             <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <artifactId>jetty</artifactId>
+            <version>${jetty_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${jetty_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jetty</groupId>
+            <artifactId>jsp-api-2.0</artifactId>
             <version>${jetty_version}</version>
         </dependency>
 
@@ -280,6 +290,12 @@
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
+            <version>${tomcat_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-compiler-jdt</artifactId>
             <version>${tomcat_version}</version>
         </dependency>
 

Modified: geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Tue Jun 27 01:13:10 2006
@@ -92,31 +92,32 @@
 import org.apache.geronimo.xbeans.geronimo.web.jetty.JettyWebAppDocument;
 import org.apache.geronimo.xbeans.geronimo.web.jetty.JettyWebAppType;
 import org.apache.geronimo.xbeans.geronimo.web.jetty.config.GerJettyDocument;
-import org.apache.geronimo.xbeans.j2ee.DispatcherType;
-import org.apache.geronimo.xbeans.j2ee.ErrorPageType;
-import org.apache.geronimo.xbeans.j2ee.FilterMappingType;
-import org.apache.geronimo.xbeans.j2ee.FilterType;
-import org.apache.geronimo.xbeans.j2ee.FormLoginConfigType;
-import org.apache.geronimo.xbeans.j2ee.JspConfigType;
-import org.apache.geronimo.xbeans.j2ee.ListenerType;
-import org.apache.geronimo.xbeans.j2ee.LocaleEncodingMappingListType;
-import org.apache.geronimo.xbeans.j2ee.LocaleEncodingMappingType;
-import org.apache.geronimo.xbeans.j2ee.LoginConfigType;
-import org.apache.geronimo.xbeans.j2ee.MessageDestinationType;
-import org.apache.geronimo.xbeans.j2ee.MimeMappingType;
-import org.apache.geronimo.xbeans.j2ee.ParamValueType;
-import org.apache.geronimo.xbeans.j2ee.ServletMappingType;
-import org.apache.geronimo.xbeans.j2ee.ServletType;
-import org.apache.geronimo.xbeans.j2ee.TaglibType;
-import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
-import org.apache.geronimo.xbeans.j2ee.WebAppType;
-import org.apache.geronimo.xbeans.j2ee.WelcomeFileListType;
+import org.apache.geronimo.xbeans.javaee.DispatcherType;
+import org.apache.geronimo.xbeans.javaee.ErrorPageType;
+import org.apache.geronimo.xbeans.javaee.FilterMappingType;
+import org.apache.geronimo.xbeans.javaee.FilterType;
+import org.apache.geronimo.xbeans.javaee.FormLoginConfigType;
+import org.apache.geronimo.xbeans.javaee.JspConfigType;
+import org.apache.geronimo.xbeans.javaee.ListenerType;
+import org.apache.geronimo.xbeans.javaee.LocaleEncodingMappingListType;
+import org.apache.geronimo.xbeans.javaee.LocaleEncodingMappingType;
+import org.apache.geronimo.xbeans.javaee.LoginConfigType;
+import org.apache.geronimo.xbeans.javaee.MessageDestinationType;
+import org.apache.geronimo.xbeans.javaee.MimeMappingType;
+import org.apache.geronimo.xbeans.javaee.ParamValueType;
+import org.apache.geronimo.xbeans.javaee.ServletMappingType;
+import org.apache.geronimo.xbeans.javaee.ServletType;
+import org.apache.geronimo.xbeans.javaee.TaglibType;
+import org.apache.geronimo.xbeans.javaee.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee.WelcomeFileListType;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
-import org.mortbay.http.BasicAuthenticator;
-import org.mortbay.http.ClientCertAuthenticator;
-import org.mortbay.http.DigestAuthenticator;
-import org.mortbay.jetty.servlet.FormAuthenticator;
+import org.mortbay.jetty.security.BasicAuthenticator;
+import org.mortbay.jetty.security.ClientCertAuthenticator;
+import org.mortbay.jetty.security.DigestAuthenticator;
+import org.mortbay.jetty.security.FormAuthenticator;
+
 
 
 /**
@@ -540,17 +541,21 @@
                             " contains a servlet mapping that refers to servlet '" + servletName + 
                             "' but no such servlet was found!");
                 }
-                String urlPattern = servletMappingType.getUrlPattern().getStringValue().trim();
-                if (!knownServletMappings.contains(urlPattern)) {
-                    knownServletMappings.add(urlPattern);
-                    checkString(urlPattern);
-                    Set urlsForServlet = (Set) servletMappings.get(servletName);
-                    if (urlsForServlet == null) {
-                        urlsForServlet = new HashSet();
-                        servletMappings.put(servletName, urlsForServlet);
+                UrlPatternType[] urlPatterns = servletMappingType.getUrlPatternArray();
+                for (int j=0; j<urlPatterns.length; j++) {
+                    String urlPattern = urlPatterns[j].getStringValue();
+                    if (!knownServletMappings.contains(urlPattern)) {
+                        knownServletMappings.add(urlPattern);
+                        checkString(urlPattern);
+                        Set urlsForServlet = (Set) servletMappings.get(servletName);
+                        if (urlsForServlet == null) {
+                            urlsForServlet = new HashSet();
+                            servletMappings.put(servletName, urlsForServlet);
+                        }
+                        urlsForServlet.add(urlPattern);
                     }
-                    urlsForServlet.add(urlPattern);
                 }
+
             }
 
             //"previous" filter mapping for linked list to keep dd's ordering.
@@ -573,9 +578,9 @@
                         filterMappingGBeanData.setReferencePattern("Previous", previous);
                     }
                     filterMappingGBeanData.setReferencePattern("JettyServletRegistration", moduleName);
-                    String urlPattern = "/*";
-                    filterMappingGBeanData.setAttribute("urlPattern", urlPattern);
-                    AbstractName filterMappingName = earContext.getNaming().createChildName(defaultFilterAbstractName, urlPattern, NameFactory.URL_WEB_FILTER_MAPPING);
+                    String urlPatterns = {"/*"};
+                    filterMappingGBeanData.setAttribute("urlPatterns", urlPatterns);
+                    AbstractName filterMappingName = earContext.getNaming().createChildName(defaultFilterAbstractName, urlPatterns, NameFactory.URL_WEB_FILTER_MAPPING);
                     filterMappingGBeanData.setAbstractName(filterMappingName);
                     previous = filterMappingName;
 
@@ -626,17 +631,29 @@
                 AbstractName filterAbstractName = earContext.getNaming().createChildName(moduleName, filterName, NameFactory.WEB_FILTER);
 
                 AbstractName filterMappingName = null;
-                if (filterMappingType.isSetUrlPattern()) {
-                    String urlPattern = filterMappingType.getUrlPattern().getStringValue().trim();
-                    filterMappingData.setAttribute("urlPattern", urlPattern);
-                    filterMappingName = earContext.getNaming().createChildName(filterAbstractName, ObjectName.quote(urlPattern), NameFactory.URL_WEB_FILTER_MAPPING);
-                }
-                if (filterMappingType.isSetServletName()) {
-                    String servletName = filterMappingType.getServletName().getStringValue().trim();
-                    AbstractName servletAbstractName = earContext.getNaming().createChildName(moduleName, servletName, NameFactory.SERVLET);
-                    filterMappingData.setReferencePattern("Servlet", servletAbstractName);
-                    filterMappingName = earContext.getNaming().createChildName(filterAbstractName, servletName, NameFactory.SERVLET_WEB_FILTER_MAPPING);
-                }
+
+
+                if (filterMappingType.sizeOfUrlPatternArray() > 0) {
+                   String[] urlPatterns = new String[filterMappingType.sizeOfUrlPatternArray()];
+                   for (int j=0; j < urlPatterns.length; j++) {
+                     urlPatterns[j] = filterMappingType.getUrlPatternArray(j).getStringValue().trim();
+                   }
+
+                   filterMappingData.setAttribute("urlPatterns", urlPatterns);
+                   //filterMappingName = NameFactory.getWebFilterMappingName(null, null, null, null, filterName, null, urlPatterns, moduleJ2eeContext);
+                }
+                if (filterMappingType.sizeOfServletNameArray() > 0) {
+                   Set servletNameSet = new HashSet();
+                   String[] servletNames = new String[filterMappingType.sizeOfUrlPatternArray()];
+                   for (int j=0; j < servletNames.length; j++) {
+                     servletNames[j] = filterMappingType.getServletNameArray(j).getStringValue().trim();
+                    //servletNameSet.add(NameFactory.getWebComponentName(null, null, null, null, servletNames[j], NameFactory.SERVLET, moduleJ2eeContext));
+                   }
+
+                   filterMappingData.setReferencePatterns("Servlets", servletNameSet);
+                   //filterMappingName = NameFactory.getWebFilterMappingName(null, null, null, null, filterName, servletNames, null, moduleJ2eeContext);
+                 }
+
                 filterMappingData.setAbstractName(filterMappingName);
                 previous = filterMappingName;
 
@@ -882,7 +899,7 @@
         }
         servletData.setAttribute("initParams", initParams);
         if (servletType.isSetLoadOnStartup()) {
-            Integer loadOnStartup = new Integer(servletType.getLoadOnStartup().getBigIntegerValue().intValue());
+            Integer loadOnStartup = new Integer(servletType.xgetLoadOnStartup().getStringValue());
             servletData.setAttribute("loadOnStartup", loadOnStartup);
         }
 
@@ -989,7 +1006,8 @@
 
             // load-on-startup is set for both.  whichever one
             // has a smaller value is "less than"
-            int comp = s1.getLoadOnStartup().getBigIntegerValue().compareTo(s2.getLoadOnStartup().getBigIntegerValue());
+            
+            int comp = new Integer(s1.xgetLoadOnStartup().getStringValue()).compareTo(new Integer(s2.xgetLoadOnStartup().getStringValue()));
             if (comp == 0) {
                 return s1.getServletName().getStringValue().trim().compareTo(s2.getServletName().getStringValue().trim());
             }

Modified: geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/StartupOrderComparatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/StartupOrderComparatorTest.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/StartupOrderComparatorTest.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/StartupOrderComparatorTest.java Tue Jun 27 01:13:10 2006
@@ -20,6 +20,8 @@
 
 import junit.framework.TestCase;
 import org.apache.geronimo.xbeans.j2ee.ServletType;
+import org.apache.xmlbeans.XmlInteger;
+import org.apache.xmlbeans.impl.values.XmlIntegerImpl;
 
 /**
  * @version $Rev$ $Date$
@@ -78,7 +80,9 @@
         ServletType s1 = ServletType.Factory.newInstance();
         s1.addNewServletName().setStringValue(servletName);
         if (order > -1) {
-            s1.addNewLoadOnStartup().setBigIntegerValue(BigInteger.valueOf(order));
+            XmlIntegerImpl xmlInteger = new XmlIntegerImpl();
+            xmlInteger.set(BigInteger.valueOf(order));
+            s1.setLoadOnStartup(xmlInteger);
         }
         return s1;
     }

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/pom.xml?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/pom.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/pom.xml Tue Jun 27 01:13:10 2006
@@ -74,43 +74,14 @@
         </dependency>
 
         <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
             <version>${jettyVersion}</version>
         </dependency>
         <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-compiler</artifactId>
-            <version>${tomcatVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-compiler-jdt</artifactId>
-            <version>${tomcatVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-runtime</artifactId>
-            <version>${tomcatVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>${commonsElVersion}</version>
-        </dependency>
- 
-       <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commonsCollectionsVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-primitives</groupId>
-            <artifactId>commons-primitives</artifactId>
-            <version>${commonsPrimitivesVersion}</version>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jsp-2.0</artifactId>
+            <version>${jettyVersion}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/project.xml?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/project.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/project.xml Tue Jun 27 01:13:10 2006
@@ -145,8 +145,16 @@
         </dependency>
 
         <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${jetty_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
             <version>${jetty_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java Tue Jun 27 01:13:10 2006
@@ -33,7 +33,7 @@
 import org.apache.geronimo.security.realm.providers.CertificateCallbackHandler;
 import org.apache.geronimo.security.realm.providers.ClearableCallbackHandler;
 import org.apache.geronimo.security.realm.providers.PasswordCallbackHandler;
-import org.mortbay.http.HttpRequest;
+import org.mortbay.jetty.Request;
 
 
 /**
@@ -58,7 +58,7 @@
         return (Principal) userMap.get(username);
     }
 
-    public Principal authenticate(String username, Object credentials, HttpRequest request) {
+    public Principal authenticate(String username, Object credentials, Request request) {
         try {
             if ((username != null) && (!username.equals(""))) {
 

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java Tue Jun 27 01:13:10 2006
@@ -20,8 +20,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.mortbay.http.HttpRequest;
-import org.mortbay.http.UserRealm;
+import org.mortbay.jetty.Request;
+import org.mortbay.jetty.security.UserRealm;
 
 
 /**
@@ -46,7 +46,7 @@
         return internalJAASJettyRealm.getPrincipal(username);
     }
 
-    public Principal authenticate(String username, Object credentials, HttpRequest request) {
+    public Principal authenticate(String username, Object credentials, Request request) {
         return internalJAASJettyRealm.authenticate(username, credentials, request);
     }
 

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java Tue Jun 27 01:13:10 2006
@@ -16,24 +16,22 @@
  */
 
 package org.apache.geronimo.jetty;
-
-import org.mortbay.http.HttpContext;
-import org.mortbay.http.HttpListener;
-import org.mortbay.http.RequestLog;
-import org.mortbay.http.UserRealm;
+import org.mortbay.jetty.handler.ContextHandler;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.RequestLog;
 import org.apache.geronimo.management.geronimo.WebContainer;
 
 /**
  * @version $Rev$ $Date$
  */
 public interface JettyContainer extends WebContainer {
-    void addListener(HttpListener listener);
+    void addListener(Connector listener);
 
-    void removeListener(HttpListener listener);
+    void removeListener(Connector listener);
 
-    void addContext(HttpContext context);
+    void addContext(ContextHandler context);
 
-    void removeContext(HttpContext context);
+    void removeContext(ContextHandler context);
 
     InternalJAASJettyRealm addRealm(String realmName);
 

Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java (original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java Tue Jun 27 01:13:10 2006
@@ -30,9 +30,10 @@
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.webservices.SoapHandler;
 import org.apache.geronimo.webservices.WebServiceContainer;
-import org.mortbay.http.HttpContext;
-import org.mortbay.http.HttpListener;
-import org.mortbay.http.RequestLog;
+import org.mortbay.jetty.handler.ContextHandler;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.RequestLog;
+import org.mortbay.jetty.security.UserRealm;
 import org.mortbay.jetty.Server;
 
 /**
@@ -78,63 +79,64 @@
     }
 
     public void resetStatistics() {
-        server.statsReset();
+      //TODO: for jetty6
     }
 
     public void setCollectStatistics(boolean on) {
-        server.setStatsOn(on);
-        stats.setStatsOn(on);
+      //TODO: for jetty6
     }
 
     public boolean getCollectStatistics() {
-        return server.getStatsOn();
+      //TODO: for jetty6
+      return false;
     }
 
     public long getCollectStatisticsStarted() {
-        return server.getStatsOnMs();
+      //TODO: for jetty6
+      return 0L;
     }
 
     public Stats getStats() {
         if (getCollectStatistics()) {
 
             /* set active request count */
-            stats.getTotalRequestCountImpl().setCount(server.getRequests());
+//            stats.getTotalRequestCountImpl().setCount(server.getRequests());
 
             /* set total connection count */
-            stats.getTotalConnectionCountImpl().setCount(server.getConnections());
+//            stats.getTotalConnectionCountImpl().setCount(server.getConnections());
 
             /* set total error count */
-            stats.getTotalErrorCountImpl().setCount(server.getErrors());
+//            stats.getTotalErrorCountImpl().setCount(server.getErrors());
 
             /* set active request range values */
-            stats.getActiveRequestCountImpl().setCurrent(server.getRequestsActive());
-            stats.getActiveRequestCountImpl().setLowWaterMark(server.getRequestsActiveMin());
-            stats.getActiveRequestCountImpl().setHighWaterMark(server.getRequestsActiveMax());
+//            stats.getActiveRequestCountImpl().setCurrent(server.getRequestsActive());
+//            stats.getActiveRequestCountImpl().setLowWaterMark(server.getRequestsActiveMin());
+//            stats.getActiveRequestCountImpl().setHighWaterMark(server.getRequestsActiveMax());
 
             /* set connection requests range values */
 //          stats.getConnectionRequestCountImpl().setCurrent(server.getConnectionsRequestsCurrent());    // temporarily removed until added by jetty
-            stats.getConnectionRequestCountImpl().setCurrent(server.getConnectionsOpen());
-            stats.getConnectionRequestCountImpl().setLowWaterMark(server.getConnectionsRequestsMin());
-            stats.getConnectionRequestCountImpl().setHighWaterMark(server.getConnectionsRequestsMax());
+//            stats.getConnectionRequestCountImpl().setCurrent(server.getConnectionsOpen());
+//            stats.getConnectionRequestCountImpl().setLowWaterMark(server.getConnectionsRequestsMin());
+//            stats.getConnectionRequestCountImpl().setHighWaterMark(server.getConnectionsRequestsMax());
 
             /* set open connection range values */
-            stats.getOpenConnectionCountImpl().setCurrent(server.getConnectionsOpen());
-            stats.getOpenConnectionCountImpl().setLowWaterMark(server.getConnectionsOpenMin());
-            stats.getOpenConnectionCountImpl().setHighWaterMark(server.getConnectionsOpenMax());
+//            stats.getOpenConnectionCountImpl().setCurrent(server.getConnectionsOpen());
+//            stats.getOpenConnectionCountImpl().setLowWaterMark(server.getConnectionsOpenMin());
+//            stats.getOpenConnectionCountImpl().setHighWaterMark(server.getConnectionsOpenMax());
 
             /* set request duration time values */
-            stats.getRequestDurationImpl().setMinTime(server.getRequestsDurationMin());
-            stats.getRequestDurationImpl().setMaxTime(server.getRequestsDurationMax());
+//            stats.getRequestDurationImpl().setMinTime(server.getRequestsDurationMin());
+//            stats.getRequestDurationImpl().setMaxTime(server.getRequestsDurationMax());
 //          stats.getRequestDurationImpl().setCount(server.getRequestsDurationCount());     // temporarily removed until added by jetty
-            stats.getRequestDurationImpl().setCount(stats.getTotalRequestCount().getCount());
-            stats.getRequestDurationImpl().setTotalTime(server.getRequestsDurationTotal());
+//            stats.getRequestDurationImpl().setCount(stats.getTotalRequestCount().getCount());
+//            stats.getRequestDurationImpl().setTotalTime(server.getRequestsDurationTotal());
 
             /* set connection duration Time values */
-            stats.getConnectionDurationImpl().setMinTime(server.getConnectionsDurationMin());
-            stats.getConnectionDurationImpl().setMaxTime(server.getConnectionsDurationMax());
+//            stats.getConnectionDurationImpl().setMinTime(server.getConnectionsDurationMin());
+//            stats.getConnectionDurationImpl().setMaxTime(server.getConnectionsDurationMax());
 //          stats.getConnectionDurationImpl().setCount(server.getConnectionsDurationCount());    // temporarily removed until added by jetty
-            stats.getConnectionDurationImpl().setCount(stats.getTotalConnectionCount().getCount());
-            stats.getConnectionDurationImpl().setTotalTime(server.getConnectionsDurationTotal());
+//            stats.getConnectionDurationImpl().setCount(stats.getTotalConnectionCount().getCount());
+//            stats.getConnectionDurationImpl().setTotalTime(server.getConnectionsDurationTotal());
 
         } else {
             // should probably set the stats object to all zero/null values to avoid unpredicable results
@@ -142,19 +144,19 @@
         return stats;
     }
 
-    public void addListener(HttpListener listener) {
-        server.addListener(listener);
+    public void addListener(Connector listener) {
+        server.addConnector(listener);
     }
 
-    public void removeListener(HttpListener listener) {
-        server.removeListener(listener);
+    public void removeListener(Connector listener) {
+        server.removeConnector(listener);
     }
 
-    public void addContext(HttpContext context) {
-        server.addContext(context);
+    public void addContext(ContextHandler context) {
+        server.addHandler(context);
     }
 
-    public void removeContext(HttpContext context) {
+    public void removeContext(ContextHandler context) {
         server.removeContext(context);
     }
 
@@ -193,16 +195,21 @@
         if (securityRealmName != null) {
             removeRealm(securityRealmName);
         }
+        try {
         removeContext(webServiceContext);
+        }catch (Exception e) {
+        	throw new IllegalStateException(e.getMessage());
+        }
     }
 
     public void setRequestLog(RequestLog log) {
-        server.setRequestLog(log);
+      //TODO: need to do this the jetty6 way with the right handler collection setup
     }
 
     /* ------------------------------------------------------------ */
     public RequestLog getRequestLog() {
-        return server.getRequestLog();
+      //TODO: need to do this the jetty6 way with the right handler collection setup
+        return null;
     }
 
     public void doStart() throws Exception {
@@ -211,15 +218,15 @@
 
     public void doStop() {
         try {
-            server.stop(true);
-        } catch (InterruptedException e) {
+            server.stop();
+        } catch (Exception e) {
         }
     }
 
     public void doFail() {
         try {
-            server.stop(false);
-        } catch (InterruptedException e) {
+            server.stop();
+        } catch (Exception e) {
             // continue
         }
     }
@@ -234,10 +241,10 @@
 
         infoBuilder.addAttribute("requestLog", RequestLog.class, false, false);
 
-        infoBuilder.addOperation("addListener", new Class[]{HttpListener.class});
-        infoBuilder.addOperation("removeListener", new Class[]{HttpListener.class});
-        infoBuilder.addOperation("addContext", new Class[]{HttpContext.class});
-        infoBuilder.addOperation("removeContext", new Class[]{HttpContext.class});
+        infoBuilder.addOperation("addListener", new Class[]{Connector.class});
+        infoBuilder.addOperation("removeListener", new Class[]{Connector.class});
+        infoBuilder.addOperation("addContext", new Class[]{ContextHandler.class});
+        infoBuilder.addOperation("removeContext", new Class[]{ContextHandler.class});
         infoBuilder.addOperation("addRealm", new Class[]{String.class});
         infoBuilder.addOperation("removeRealm", new Class[]{String.class});
 



Mime
View raw message