portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jf...@apache.org
Subject svn commit: r503344 - /portals/jetspeed-2/trunk/etc/xsd/psml.xsd
Date Sun, 04 Feb 2007 02:20:10 GMT
Author: jford
Date: Sat Feb  3 18:20:10 2007
New Revision: 503344

URL: http://svn.apache.org/viewvc?view=rev&rev=503344
Log:
Added missing elements

Modified:
    portals/jetspeed-2/trunk/etc/xsd/psml.xsd

Modified: portals/jetspeed-2/trunk/etc/xsd/psml.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/xsd/psml.xsd?view=diff&rev=503344&r1=503343&r2=503344
==============================================================================
--- portals/jetspeed-2/trunk/etc/xsd/psml.xsd (original)
+++ portals/jetspeed-2/trunk/etc/xsd/psml.xsd Sat Feb  3 18:20:10 2007
@@ -45,15 +45,15 @@
   <xs:element name="metadata">
     <xs:complexType mixed="true">
       <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute ref="xml:lang" use="required"/>
+      <xs:attribute ref="xml:lang" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="owner" type="xs:string"/>
   <xs:element name="security-constraints">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="tns:owner"/>
-        <xs:element maxOccurs="unbounded" ref="tns:security-constraint"/>
+        <xs:element minOccurs="0" ref="tns:owner"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:security-constraint"/>
         <xs:element ref="tns:security-constraints-ref"/>
       </xs:sequence>
     </xs:complexType>
@@ -61,11 +61,15 @@
   <xs:element name="security-constraint">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="tns:users"/>
+        <xs:element minOccurs="0" ref="tns:users"/>
+        <xs:element minOccurs="0" ref="tns:groups"/>
+        <xs:element minOccurs="0" ref="tns:roles"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="users" type="xs:string"/>
+  <xs:element name="groups" type="xs:string"/>
+  <xs:element name="roles" type="xs:string"/>
   <xs:element name="security-constraints-ref" type="xs:string"/>
   <xs:element name="fragment">
     <xs:complexType>
@@ -82,7 +86,7 @@
   </xs:element>
   <xs:element name="property">
     <xs:complexType>
-      <xs:attribute name="layout" use="required" type="xs:string"/>
+      <xs:attribute name="layout" use="optional" type="xs:string"/>
       <xs:attribute name="name" use="required" type="xs:string"/>
       <xs:attribute name="value" use="required" type="xs:string"/>
     </xs:complexType>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message