directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1500754 - in /directory/escimo/trunk/common: ./ src/main/resources/scim-core.xsd
Date Mon, 08 Jul 2013 14:21:53 GMT
Author: kayyagari
Date: Mon Jul  8 14:21:53 2013
New Revision: 1500754

URL: http://svn.apache.org/r1500754
Log:
updated the core schema with the latest version available on SCIM site

Modified:
    directory/escimo/trunk/common/   (props changed)
    directory/escimo/trunk/common/src/main/resources/scim-core.xsd

Propchange: directory/escimo/trunk/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul  8 14:21:53 2013
@@ -0,0 +1,3 @@
+.classpath
+.project
+target

Modified: directory/escimo/trunk/common/src/main/resources/scim-core.xsd
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/resources/scim-core.xsd?rev=1500754&r1=1500753&r2=1500754&view=diff
==============================================================================
--- directory/escimo/trunk/common/src/main/resources/scim-core.xsd (original)
+++ directory/escimo/trunk/common/src/main/resources/scim-core.xsd Mon Jul  8 14:21:53 2013
@@ -279,7 +279,7 @@
   	</xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="multiValuedAttribute" abstract="true">
+  <xs:complexType name="multiValuedAttribute">
     <xs:sequence>
       <xs:element name="value" type="xs:anyType" minOccurs="0"/>
       <xs:element name="display" type="xs:string" minOccurs="0"/>
@@ -319,42 +319,42 @@
     </xs:sequence>
   </xs:complexType>
 
-   <xs:complexType name="SchemaAttribute">
-    <xs:complexContent>
-      <xs:extension base="tns:SchemaSubAttribute">
-        <xs:sequence>
-          <xs:element name="multiValued" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="multiValuedAttributeChildName" type="xs:string" minOccurs="0"/>
-          <xs:element name="canonicalValues" type="xs:string" minOccurs="0"/>
-          <xs:element name="subAttributes" minOccurs="0">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="subAttribute"
-                          type="tns:SchemaSubAttribute"
-                          minOccurs="0"
-                          maxOccurs="unbounded"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
+  <xs:complexType name="SchemaAttribute">
+   <xs:sequence>
+     <xs:element name="name" type="xs:string" minOccurs="0"/>
+     <xs:element name="type" type="xs:string" minOccurs="0"/>
+     <xs:element name="multiValued" type="xs:boolean" minOccurs="0"/>
+     <xs:element name="multiValuedAttributeChildName" type="xs:string" minOccurs="0"/>
+     <xs:element name="description" type="xs:string" minOccurs="0"/>
+     <xs:element name="schema" type="xs:string" minOccurs="0"/>
+     <xs:element name="readOnly" type="xs:boolean" minOccurs="0"/>
+     <xs:element name="required" type="xs:boolean" minOccurs="0"/>
+     <xs:element name="caseExact" type="xs:boolean" minOccurs="0"/>
+     <xs:element name="subAttributes" minOccurs="0">
+       <xs:complexType>
+         <xs:sequence>
+           <xs:element name="subAttribute"
+                   type="tns:SchemaSubAttribute"
+                   minOccurs="0"
+                   maxOccurs="unbounded"/>
+         </xs:sequence>
+       </xs:complexType>
+     </xs:element>
+   </xs:sequence>
+ </xs:complexType>
 
   <xs:complexType name="SchemaSubAttribute">
-    <xs:complexContent>
-  	  <xs:extension base="tns:multiValuedAttribute">
-        <xs:sequence>
-          <xs:element name="name" type="xs:string" minOccurs="0"/>
-          <xs:element name="type" type="xs:string" minOccurs="0"/>
-          <xs:element name="description" type="xs:string" minOccurs="0"/>
-          <xs:element name="schema" type="xs:string" minOccurs="0"/>
-          <xs:element name="readOnly" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="required" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="caseExact" type="xs:boolean" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
+    <xs:sequence>
+      <xs:element name="name" type="xs:string" minOccurs="0"/>
+      <xs:element name="type" type="xs:string" minOccurs="0"/>
+      <xs:element name="description" type="xs:string" minOccurs="0"/>
+      <xs:element name="readOnly" type="xs:boolean" minOccurs="0"/>
+      <xs:element name="required" type="xs:boolean" minOccurs="0"/>
+      <xs:element name="caseExact" type="xs:boolean" minOccurs="0"/>
+      <xs:sequence>
+        <xs:element name="canonicalValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:sequence>
   </xs:complexType>
 
   <xs:complexType name="Schema">
@@ -367,15 +367,15 @@
             minOccurs="0"/>
           <xs:element name="schema" type="xs:string"
             minOccurs="0"/>
-          <xs:element name="queryEndpoint" type="xs:string"
+          <xs:element name="endpoint" type="xs:string"
             minOccurs="0"/>
           <xs:element name="attributes" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="attribute"
-                          type="tns:SchemaSubAttribute"
-                          minOccurs="0"
-                          maxOccurs="unbounded"/>
+                         type="tns:SchemaAttribute"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
               </xs:sequence>
             </xs:complexType>
           </xs:element>



Mime
View raw message