geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r392836 [1/6] - in /geronimo/sandbox/servlet-2.5: etc/ modules/j2ee-schema/ modules/j2ee-schema/src/catalog/ modules/j2ee-schema/src/conf/ modules/j2ee-schema/src/javaee_5schema/ modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectname...
Date Sun, 09 Apr 2006 21:14:01 GMT
Author: janb
Date: Sun Apr  9 14:13:57 2006
New Revision: 392836

URL: http://svn.apache.org/viewcvs?rev=392836&view=rev
Log:
add all javaee5 schemas and up the version of jetty to 6.0-SNAPSHOT and start making changes
to support the new API and servlet spec

Added:
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application-client_5.xsd
  (with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application_5.xsd
  (with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/ejb-jar_3_0.xsd  
(with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/javaee_5.xsd   (with
props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/javaee_web_services_1_2.xsd
  (with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/javaee_web_services_client_1_2.xsd
  (with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/jsp_2_1.xsd   (with
props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-app_2_5.xsd  
(with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-facesconfig_1_2.xsd
  (with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/web-jsptaglibrary_2_1.xsd
  (with props)
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/xml.xsd   (with props)
Modified:
    geronimo/sandbox/servlet-2.5/etc/project.properties
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/maven.xml
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/pom.xml
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/catalog/resolver-catalog.xml
    geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/conf/xmlconfig.xml
    geronimo/sandbox/servlet-2.5/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
    geronimo/sandbox/servlet-2.5/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyEJBWebServiceContext.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterHolder.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
    geronimo/sandbox/servlet-2.5/modules/jetty/src/java/org/apache/geronimo/jetty/NonAuthenticator.java

Modified: geronimo/sandbox/servlet-2.5/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/sandbox/servlet-2.5/etc/project.properties?rev=392836&r1=392835&r2=392836&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/etc/project.properties (original)
+++ geronimo/sandbox/servlet-2.5/etc/project.properties Sun Apr  9 14:13:57 2006
@@ -148,7 +148,7 @@
 jdbm_version=0.20-dev
 jdom_version=1.0
 jelly_velocity_tags_version=1.0
-jetty_version=5.1.10
+jetty_version=6.0-SNAPSHOT
 jstl_version=1.1.1
 juddi_version=0.9rc4
 junit_version=3.8.1

Modified: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/maven.xml?rev=392836&r1=392835&r2=392836&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/maven.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/maven.xml Sun Apr  9 14:13:57 2006
@@ -28,10 +28,18 @@
     <preGoal name="java:compile">
         <xmlbeans:schema2java
             maven.xmlbeans2.sourcedir="${basedir}/src"
-            maven.xmlbeans2.sourceschema="j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd"
+            maven.xmlbeans2.sourceschema="j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,javaee_5schema/application_5.xsd,javaee_5schema/javaee_5.xsd,javaee_5schema/ejb-jar_3_0.xsd,javaee_5schema/web-app_2_5.xsd,javaee_5schema/application-client_5.xsd,javaee_5schema/javaee_web_services_1_2.xsd"
             maven.xmlbeans2.xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
             maven.xmlbeans2.targetdir="${basedir}/target/xmlbeans"
             maven.xmlbeans2.cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/>
+        <!-- xmlbeans:schema2java
+            maven.xmlbeans2.sourcedir="${basedir}/src"
+            maven.xmlbeans2.sourceschema="j2ee_1_4schema/connector1_5.xsd, j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd"
+            maven.xmlbeans2.xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
+            maven.xmlbeans2.targetdir="${basedir}/target/xmlbeans"
+            maven.xmlbeans2.cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/
!-->
+
+
         <mkdir dir="${basedir}/target/xmlbeans-classes"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
         <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">

Modified: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/pom.xml?rev=392836&r1=392835&r2=392836&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/pom.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/pom.xml Sun Apr  9 14:13:57 2006
@@ -44,7 +44,7 @@
         </executions>
         <configuration>
           <download>true</download>
-          <sourceSchemas>j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd</sourceSchemas>
+          <sourceSchemas>javaee_5schema/application_5.xsd,javaee_5schema/j2ee_jaxrpc_mapping_1_1.xsd,javaee_5schema/javaee_5.xsd,javaee_5schema/ejb-jar_3_0.xsd,javaee_5schema/web-app_2_5.xsd,javaee_5schema/application-client_5.xsd,javaee_5schema/javaee_web_services_1_2.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd</sourceSchemas>
           <schemaDirectory>src</schemaDirectory>
           <catalogLocation>src/catalog/resolver-catalog.xml</catalogLocation>
           <xmlConfigs>

Modified: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/catalog/resolver-catalog.xml
URL: http://svn.apache.org/viewcvs/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/catalog/resolver-catalog.xml?rev=392836&r1=392835&r2=392836&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/catalog/resolver-catalog.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/catalog/resolver-catalog.xml Sun
Apr  9 14:13:57 2006
@@ -1,12 +1,16 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
+    <public publicId="http://java.sun.com/xml/ns/javaee"
+        uri="../javaee_5schema/javaee_5.xsd"/>
+
     <public publicId="http://java.sun.com/xml/ns/j2ee"
-        uri="../j2ee_1_4schema/j2ee_1_4.xsd"/>
+        uri="../javaee_4schema/j2ee_1_4.xsd"/>
 
     <public publicId="http://www.w3.org/XML/1998/namespace"
-        uri="../j2ee_1_4schema/xml.xsd"/>
+        uri="../javaee_5schema/xml.xsd"/>
+
 
-    <system systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
-        uri="../j2ee_1_4schema/j2ee_web_services_client_1_1.xsd"/>
+    <system systemId="http://www.ibm.com/webservices/xsd/javaee_web_services_client_1_1.xsd"
+        uri="../j2ee_1_4schema/javaee_web_services_client_1_1.xsd"/>
 
-</catalog>
\ No newline at end of file
+</catalog>

Modified: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/conf/xmlconfig.xml
URL: http://svn.apache.org/viewcvs/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/conf/xmlconfig.xml?rev=392836&r1=392835&r2=392836&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/conf/xmlconfig.xml (original)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/conf/xmlconfig.xml Sun Apr  9 14:13:57
2006
@@ -1,6 +1,10 @@
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
     >
 
+    <xb:namespace uri="http://java.sun.com/xml/ns/javaee">
+        <xb:package>org.apache.geronimo.xbeans.j2ee</xb:package>
+    </xb:namespace>
+
     <xb:namespace uri="http://java.sun.com/xml/ns/j2ee">
         <xb:package>org.apache.geronimo.xbeans.j2ee</xb:package>
     </xb:namespace>
@@ -10,4 +14,4 @@
         <xb:suffix>10</xb:suffix>
     </xb:namespace-->
 
-</xb:config>
\ No newline at end of file
+</xb:config>

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application-client_5.xsd
URL: http://svn.apache.org/viewcvs/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application-client_5.xsd?rev=392836&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application-client_5.xsd
(added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application-client_5.xsd
Sun Apr  9 14:13:57 2006
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/javaee"
+	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="5">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)application-client_5.xsds	1.26 02/17/06
+    </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 application client 5
+	deployment descriptor.  The deployment descriptor must
+	be named "META-INF/application-client.xml" in the
+	application client's jar file.  All application client
+	deployment descriptors must indicate the application
+	client schema by using the Java EE namespace:
+
+	http://java.sun.com/xml/ns/javaee
+
+	and indicate the version of the schema by
+	using the version element as shown below:
+
+	    <application-client 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/javaee
+		http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
+	      version="5">
+	      ...
+	    </application-client>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for Java EE
+	namespace with the following location:
+
+	http://java.sun.com/xml/ns/javaee/application-client_5.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all Java EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="javaee_5.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:element name="application-client" type="javaee:application-clientType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The application-client element is the root element of an
+	application client deployment descriptor.  The application
+	client deployment descriptor describes the EJB components
+	and external resources referenced by the application
+	client.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="env-entry-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The env-entry-name element contains the name of an
+	  application client's environment entry.  The name is a JNDI
+	  name relative to the java:comp/env context.  The name must
+	  be unique within an application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:env-entry"/>
+      <xsd:field    xpath="javaee:env-entry-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="ejb-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The ejb-ref-name element contains the name of an EJB
+	  reference. The EJB reference is an entry in the application
+	  client's environment and is relative to the
+	  java:comp/env context. The name must be unique within the
+	  application client.
+
+	  It is recommended that name is prefixed with "ejb/".
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:ejb-ref"/>
+      <xsd:field    xpath="javaee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="res-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The res-ref-name element specifies the name of a
+	  resource manager connection factory reference.The name
+	  is a JNDI name relative to the java:comp/env context.
+	  The name must be unique within an application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:resource-ref"/>
+      <xsd:field    xpath="javaee:res-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="resource-env-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The resource-env-ref-name element specifies the name of
+	  a resource environment reference; its value is the
+	  environment entry name used in the application client
+	  code. The name is a JNDI name relative to the
+	  java:comp/env context and must be unique within an
+	  application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:resource-env-ref"/>
+      <xsd:field    xpath="javaee:resource-env-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="message-destination-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The message-destination-ref-name element specifies the
+	  name of a message destination reference; its value is
+	  the message destination reference name used in the
+	  application client code. The name is a JNDI name
+	  relative to the java:comp/env context and must be unique
+	  within an application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:message-destination-ref"/>
+      <xsd:field    xpath="javaee:message-destination-ref-name"/>
+    </xsd:unique>
+  </xsd:element>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="application-clientType">
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="env-entry"
+		   type="javaee:env-entryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref"
+		   type="javaee:ejb-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:group ref="javaee:service-refGroup"/>
+      <xsd:element name="resource-ref"
+		   type="javaee:resource-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="resource-env-ref"
+		   type="javaee:resource-env-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="message-destination-ref"
+		   type="javaee:message-destination-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="persistence-unit-ref"
+		   type="javaee:persistence-unit-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="post-construct"
+		   type="javaee:lifecycle-callbackType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="pre-destroy"
+		   type="javaee:lifecycle-callbackType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="callback-handler"
+		   type="javaee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The callback-handler element names a class provided by
+	    the application.  The class must have a no args
+	    constructor and must implement the
+	    javax.security.auth.callback.CallbackHandler
+	    interface.  The class will be instantiated by the
+	    application client container and used by the container
+	    to collect authentication information from the user.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="message-destination"
+		   type="javaee:message-destinationType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="version"
+		   type="javaee:dewey-versionType"
+		   fixed="5"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The required value for the version is 5.
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+
+    <xsd:attribute name="metadata-complete" type="xsd:boolean">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The metadata-complete attribute defines whether this
+	  deployment descriptor and other related deployment
+	  descriptors for this module (e.g., web service
+	  descriptors) are complete, or whether the class
+	  files available to this module and packaged with
+	  this application should be examined for annotations
+	  that specify deployment information.
+
+	  If metadata-complete is set to "true", the deployment
+	  tool must ignore any annotations that specify deployment
+	  information, which might be present in the class files
+	  of the application.
+
+	  If metadata-complete is not specified or is set to
+	  "false", the deployment tool must examine the class
+	  files of the application for annotations, as
+	  specified by the specifications.
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+</xsd:schema>
+

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

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

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

Added: geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application_5.xsd
URL: http://svn.apache.org/viewcvs/geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application_5.xsd?rev=392836&view=auto
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application_5.xsd
(added)
+++ geronimo/sandbox/servlet-2.5/modules/j2ee-schema/src/javaee_5schema/application_5.xsd
Sun Apr  9 14:13:57 2006
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/javaee"
+	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="5">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)application_5.xsds	1.17 08/05/05
+    </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 application 5 deployment
+	descriptor.  The deployment descriptor must be named
+	"META-INF/application.xml" in the application's ear file.
+	All application deployment descriptors must indicate
+	the application schema by using the Java EE namespace:
+
+	http://java.sun.com/xml/ns/javaee
+
+	and indicate the version of the schema by
+	using the version element as shown below:
+
+	    <application 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/javaee
+		http://java.sun.com/xml/ns/javaee/application_5.xsd"
+	      version="5">
+	      ...
+	    </application>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for Java EE
+	namespace with the following location:
+
+	http://java.sun.com/xml/ns/javaee/application_5.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all Java EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="javaee_5.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:element name="application" type="javaee:applicationType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The application element is the root element of a Java EE
+	application deployment descriptor.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="context-root-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The context-root element content must be unique
+	  in the ear.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:module/javaee:web"/>
+      <xsd:field    xpath="javaee:context-root"/>
+    </xsd:unique>
+
+    <xsd:unique name="security-role-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The security-role-name element content
+	  must be unique in the ear.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="javaee:security-role"/>
+      <xsd:field    xpath="javaee:role-name"/>
+    </xsd:unique>
+
+  </xsd:element>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="applicationType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The applicationType defines the structure of the
+	application.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="javaee:descriptionGroup"/>
+      <xsd:element name="module"
+		   type="javaee:moduleType"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The application deployment descriptor must have one
+	    module element for each Java EE module in the
+	    application package. A module element is defined
+	    by moduleType definition.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="security-role"
+		   type="javaee:security-roleType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="library-directory"
+		   type="javaee:pathType"
+		   minOccurs="0"
+		   maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The library-directory element specifies the pathname
+	    of a directory within the application package, relative
+	    to the top level of the application package.  All files
+	    named "*.jar" in this directory must be made available
+	    in the class path of all components included in this
+	    application package.  If this element isn't specified,
+	    the directory named "lib" is searched.  An empty element
+	    may be used to disable searching.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="javaee:dewey-versionType"
+		   fixed="5"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The required value for the version is 5.
+
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="moduleType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The moduleType defines a single Java EE module and contains a
+	connector, ejb, java, or web element, which indicates the
+	module type and contains a path to the module file, and an
+	optional alt-dd element, which specifies an optional URI to
+	the post-assembly version of the deployment descriptor.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:choice>
+	<xsd:element name="connector"
+		     type="javaee:pathType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The connector element specifies the URI of a
+	      resource adapter archive file, relative to the
+	      top level of the application package.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="ejb"
+		     type="javaee:pathType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The ejb element specifies the URI of an ejb-jar,
+	      relative to the top level of the application
+	      package.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="java"
+		     type="javaee:pathType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The java element specifies the URI of a java
+	      application client module, relative to the top
+	      level of the application package.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="web"
+		     type="javaee:webType"/>
+      </xsd:choice>
+      <xsd:element name="alt-dd"
+		   type="javaee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The alt-dd element specifies an optional URI to the
+	    post-assembly version of the deployment descriptor
+	    file for a particular Java EE module.  The URI must
+	    specify the full pathname of the deployment
+	    descriptor file relative to the application's root
+	    directory. If alt-dd is not specified, the deployer
+	    must read the deployment descriptor from the default
+	    location and file name required by the respective
+	    component specification.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="webType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The webType defines the web-uri and context-root of
+	a web application module.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="web-uri"
+		   type="javaee:pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The web-uri element specifies the URI of a web
+	    application file, relative to the top level of the
+	    application package.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="context-root"
+		   type="javaee:string">
+
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The context-root element specifies the context root
+	    of a web application.
+
+	  </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/application_5.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

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

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



Mime
View raw message