portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jf...@apache.org
Subject svn commit: r501714 - /portals/jetspeed-2/trunk/etc/xsd/jetspeed-portlet.xsd
Date Wed, 31 Jan 2007 03:45:17 GMT
Author: jford
Date: Tue Jan 30 19:45:16 2007
New Revision: 501714

URL: http://svn.apache.org/viewvc?view=rev&rev=501714
Log:
Allow metadata to come in any order

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

Modified: portals/jetspeed-2/trunk/etc/xsd/jetspeed-portlet.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/xsd/jetspeed-portlet.xsd?view=diff&rev=501714&r1=501713&r2=501714
==============================================================================
--- portals/jetspeed-2/trunk/etc/xsd/jetspeed-portlet.xsd (original)
+++ portals/jetspeed-2/trunk/etc/xsd/jetspeed-portlet.xsd Tue Jan 30 19:45:16 2007
@@ -32,8 +32,8 @@
   <xs:element name="portlet-app">
     <xs:complexType mixed="true">
       <xs:sequence>
-        <xs:element name="security-constraint-ref" type="xs:string"/>          
-        <xs:group ref="tns:metadataGroup" minOccurs="0"/>
+        <xs:element name="security-constraint-ref" minOccurs="0" type="xs:string"/>
         
+        <xs:group ref="tns:metadataGroup" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element ref="tns:custom-portlet-mode" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element ref="tns:custom-window-state" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element ref="tns:portlet" minOccurs="0" maxOccurs="unbounded"/>
@@ -49,12 +49,12 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element name="portlet-name" type="xs:string"/>
-        <xs:element name="security-constraint-ref" type="xs:string"/>
-        <xs:group ref="tns:metadataGroup" minOccurs="0"/>
+        <xs:element name="security-constraint-ref" minOccurs="0" type="xs:string"/>
+        <xs:group ref="tns:metadataGroup" minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>  
-      
+
   <xs:element name="custom-portlet-mode">
     <xs:complexType>
       <xs:sequence>
@@ -87,7 +87,7 @@
     
   <xs:element name="metadata">
     <xs:complexType mixed="true">
-      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attribute name="name" use="required" type="xs:string"/>
       <xs:attribute ref="xml:lang"/>
     </xs:complexType>
   </xs:element>
@@ -100,27 +100,27 @@
   </xs:element>
   <xs:element name="service">
     <xs:complexType>
-      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attribute name="name" use="required" type="xs:string"/>
     </xs:complexType>
   </xs:element>
   <xs:group name="metadataGroup">
-     <xs:sequence>
-       <xs:element ref="dc:creator" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:description" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:title" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:type" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:source" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:right" minOccurs="0" maxOccurs="unbounded"/>
+     <xs:choice>
+       <xs:element ref="dc:creator"/>
+       <xs:element ref="dc:description"/>
+       <xs:element ref="dc:title"/>
+       <xs:element ref="dc:type"/>
+       <xs:element ref="dc:source"/>
+       <xs:element ref="dc:right"/>
          
-       <xs:element ref="dc:relation" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:publisher" minOccurs="0" maxOccurs="unbounded"/>       
   
-       <xs:element ref="dc:language" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:identifer" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:format" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:contributor" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="dc:coverage" minOccurs="0" maxOccurs="unbounded"/> 
-       <xs:element ref="dc:subject" minOccurs="0" maxOccurs="unbounded"/>
-       <xs:element ref="js:metadata" minOccurs="0" maxOccurs="unbounded"/>
-     </xs:sequence>
+       <xs:element ref="dc:relation"/>
+       <xs:element ref="dc:publisher"/>
+       <xs:element ref="dc:language"/>
+       <xs:element ref="dc:identifer"/>
+       <xs:element ref="dc:format"/>
+       <xs:element ref="dc:contributor"/>
+       <xs:element ref="dc:coverage"/> 
+       <xs:element ref="dc:subject"/>
+       <xs:element ref="js:metadata"/>
+     </xs:choice>
   </xs:group>
 </xs:schema>



---------------------------------------------------------------------
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