geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r557733 - in /geronimo/server/trunk/modules: geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd
Date Thu, 19 Jul 2007 18:49:45 GMT
Author: djencks
Date: Thu Jul 19 11:49:44 2007
New Revision: 557733

URL: http://svn.apache.org/viewvc?view=rev&rev=557733
Log:
GERONIMO-3308 explicitly allow persistence xml in web plans

Modified:
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd?view=diff&rev=557733&r1=557732&r2=557733
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/geronimo-jetty-1.2.xsd
Thu Jul 19 11:49:44 2007
@@ -21,6 +21,7 @@
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
+    xmlns:ee="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
     attributeFormDefault="unqualified" version="1.0">
 
@@ -79,6 +80,8 @@
         </xs:annotation>
     </xs:import>
 
+    <xs:import namespace="http://java.sun.com/xml/ns/persistence" schemaLocation="persistence-1.0.xsd"/>
+
     <xs:element name="web-app" type="web:web-appType">
         <xs:annotation>
             <xs:documentation>
@@ -202,14 +205,17 @@
                 </xs:element>
             </xs:sequence>
 
-            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
-                <xs:annotation>
-                    <xs:documentation>
-                        Reference to security element defined in imported
-                        "geronimo-module-1.2.xsd"
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Reference to abstract service element defined in imported
+                            "geronimo-module-1.2.xsd"
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+                <xs:element ref="ee:persistence"/>
+            </xs:choice>
         </xs:sequence>
     </xs:complexType>
 

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd?view=diff&rev=557733&r1=557732&r2=557733
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd
Thu Jul 19 11:49:44 2007
@@ -21,6 +21,7 @@
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+    xmlns:ee="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
     attributeFormDefault="unqualified" version="1.1">
 
@@ -74,6 +75,8 @@
         </xs:annotation>
     </xs:import>
 
+    <xs:import namespace="http://java.sun.com/xml/ns/persistence" schemaLocation="persistence-1.0.xsd"/>
+
     <xs:element name="web-app" type="tomcat:web-appType">
         <xs:annotation>
             <xs:documentation>
@@ -232,14 +235,17 @@
                 </xs:element>
             </xs:sequence>
 
-            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
-                <xs:annotation>
-                    <xs:documentation>
-                        Reference to security element defined in imported
-                        "geronimo-module-1.2.xsd"
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Reference to abstract service element defined in imported
+                            "geronimo-module-1.2.xsd"
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+                <xs:element ref="ee:persistence"/>
+            </xs:choice>
         </xs:sequence>
     </xs:complexType>
 

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd?view=diff&rev=557733&r1=557732&r2=557733
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd
(original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd
Thu Jul 19 11:49:44 2007
@@ -25,6 +25,7 @@
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+    xmlns:ee="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
@@ -33,6 +34,7 @@
     <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
+    <xs:import namespace="http://java.sun.com/xml/ns/persistence" schemaLocation="persistence-1.0.xsd"/>
 
     <xs:element name="web-app" type="web:web-appType"/>
     <xs:annotation>
@@ -85,7 +87,18 @@
                 <xs:element ref="app:security" minOccurs="0"/>
             </xs:sequence>
 
-            <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Reference to abstract service element defined in imported
+                            "geronimo-module-1.2.xsd"
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+                <xs:element ref="ee:persistence"/>
+            </xs:choice>
+            
 
         </xs:sequence>
     </xs:complexType>



Mime
View raw message