Author: ieb
Date: Tue Nov 4 18:25:14 2008
New Revision: 711491
URL: http://svn.apache.org/viewvc?rev=711491&view=rev
Log:
SHINDIG-562
Dicovered some errors in the schema wrt the json serialization where real
multi responses
were no being correctly validated or expressed. Modified by removing the
Collection complex
type and expending the potential tags in the response. The unbounded
aspects of the entry
unfortunately causes a xs:sequence container.
Modified:
incubator/shindig/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
Modified:
incubator/shindig/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd?rev=711491&r1=711490&r2=711491&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/resources/org/apache/shindig/social/opensocial/util/opensocial.xsd
Tue Nov 4 18:25:14 2008
@@ -15,53 +15,31 @@
<xs:element name="list.container" type="xs:anyType" />
<xs:complexType name="Response">
- <xs:choice>
- <xs:element name="group" type="tns:GroupCollection" />
- <xs:element name="activity" type="tns:ActivityCollection" />
- <xs:element name="person" type="tns:PersonCollection" />
- </xs:choice>
- </xs:complexType>
-
- <xs:complexType name="Collection" abstract="true">
<xs:sequence>
<xs:element minOccurs="0" name="itemsPerPage" type="xs:int" />
<xs:element minOccurs="0" name="startIndex" type="xs:long" />
<xs:element minOccurs="0" name="totalResults" type="xs:long" />
+ <xs:element minOccurs="0" name="isFiltered" type="xs:boolean" />
+ <xs:element minOccurs="0" name="isSorted" type="xs:boolean" />
+ <xs:element minOccurs="0" name="isUpdatedSince" type="xs:boolean" />
+ <xs:element minOccurs="0" name="group" type="tns:Group" />
+ <xs:element minOccurs="0" name="activity" type="tns:Activity" />
+ <xs:element minOccurs="0" name="person" type="tns:Person" />
+ <xs:element minOccurs="0" maxOccurs="unbounded" name="entry"
type="tns:Entry" />
+ <!-- this is to allow responses to create to validate -->
+ <xs:element minOccurs="0" name="map" type="xs:anyType" />
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ActivityCollection" >
- <xs:complexContent>
- <xs:extension base="tns:Collection">
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" name="entry"
type="tns:Activity" />
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="PersonCollection" >
- <xs:complexContent>
- <xs:extension base="tns:Collection">
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" name="entry"
type="tns:Person" />
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="GroupCollection" >
- <xs:complexContent>
- <xs:extension base="tns:Collection">
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" name="entry"
type="tns:Group" />
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="Entry" >
+ <xs:choice>
+ <xs:element minOccurs="0" name="activity" type="tns:Activity" />
+ <xs:element minOccurs="0" name="person" type="tns:Person" />
+ <xs:element minOccurs="0" name="group" type="tns:Group" />
+ </xs:choice>
</xs:complexType>
-
-
+
<xs:complexType name="Activity">
<xs:sequence>
<xs:element minOccurs="0" name="appId" type="xs:string" />
