geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r216014 - /geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd
Date Tue, 12 Jul 2005 20:31:19 GMT
Author: djencks
Date: Tue Jul 12 13:31:15 2005
New Revision: 216014

URL: http://svn.apache.org/viewcvs?rev=216014&view=rev
Log:
GERONIMO-736 don't use foreign namespace for description elements

Modified:
    geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd

Modified: geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd?rev=216014&r1=216013&r2=216014&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd (original)
+++ geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd Tue Jul 12 13:31:15
2005
@@ -25,7 +25,7 @@
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_1_4.xsd"/>
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="schema/xml.xsd"/>
 
     <xsd:element name="security" type="geronimo:securityType"/>
     <xsd:element name="default-principal" type="geronimo:default-principalType"/>
@@ -40,7 +40,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
             <xsd:element name="default-principal" type="geronimo:default-principalType"/>
             <xsd:element name="role-mappings" type="geronimo:role-mappingsType" minOccurs="0"/>
         </xsd:sequence>
@@ -72,9 +72,19 @@
             </xsd:annotation>
         </xsd:attribute>
     </xsd:complexType>
+
+    <xsd:complexType name="descriptionType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute ref="xml:lang"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+
     <xsd:complexType name="default-principalType">
         <xsd:sequence>
-            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
             <xsd:element name="principal" type="geronimo:principalType"/>
             <xsd:element name="named-username-password-credential" type="geronimo:named-username-password-credentialType"
minOccurs="0" maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -97,7 +107,7 @@
 
     <xsd:complexType name="roleType">
         <xsd:sequence>
-            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
             <xsd:element name="realm" type="geronimo:realmType" minOccurs="0" maxOccurs="unbounded"/>
             <xsd:element name="distinguished-name" type="geronimo:distinguishedNameType"
minOccurs="0" maxOccurs="unbounded"/>
         </xsd:sequence>
@@ -105,14 +115,14 @@
     </xsd:complexType>
     <xsd:complexType name="realmType">
         <xsd:sequence>
-            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
             <xsd:element name="principal" type="geronimo:principalType" minOccurs="1"
maxOccurs="unbounded"/>
         </xsd:sequence>
         <xsd:attribute name="realm-name" type="xsd:string" use="required"/>
     </xsd:complexType>
     <xsd:complexType name="principalType">
         <xsd:sequence>
-            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
         </xsd:sequence>
         <xsd:attribute name="class" type="xsd:string" use="required"/>
         <xsd:attribute name="name" type="xsd:string" use="required"/>
@@ -127,7 +137,7 @@
     </xsd:complexType>
     <xsd:complexType name="distinguishedNameType">
         <xsd:sequence>
-            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
maxOccurs="unbounded"/>
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required"/>
         <xsd:attribute name="designated-run-as" type="xsd:boolean" default="false">



Mime
View raw message