chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r912593 - in /incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl: APP.xsd ATOM.xsd CMIS-Core.xsd CMIS-Messaging.xsd CMIS-RestAtom.xsd xml.xsd
Date Mon, 22 Feb 2010 14:49:35 GMT
Author: fguillaume
Date: Mon Feb 22 14:49:35 2010
New Revision: 912593

URL: http://svn.apache.org/viewvc?rev=912593&view=rev
Log:
Update XML Schemas to latest CMIS 1.0 cd07 rev 2

Removed:
    incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/APP.xsd
    incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/ATOM.xsd
    incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/xml.xsd
Modified:
    incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Core.xsd
    incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Messaging.xsd
    incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-RestAtom.xsd

Modified: incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Core.xsd
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Core.xsd?rev=912593&r1=912592&r2=912593&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Core.xsd
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Core.xsd
Mon Feb 22 14:49:35 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	<!--
-		$Revision: 137 $ $Date: 2009-10-21 15:50:27 -0700 (Wed, 21 Oct 2009) $
+		$Revision: 169 $ $Date: 2010-01-25 10:34:39 -0800 (Mon, 25 Jan 2010) $
 		$Author: albertcbrown $ $HeadURL:
 		http://tools.oasis-open.org/version-control/svn/cmis/trunk/SchemaProject/schema/CMIS-Core.xsd
 		$
@@ -41,7 +41,7 @@
 			<xs:enumeration value="oncreate" />
 		</xs:restriction>
 	</xs:simpleType>
-		<xs:simpleType name="enumDateTimeResolution">
+	<xs:simpleType name="enumDateTimeResolution">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="year" />
 			<xs:enumeration value="date" />
@@ -304,6 +304,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:boolean" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -314,6 +316,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:string" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -324,6 +328,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:integer" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -334,6 +340,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:dateTime" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -344,6 +352,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:decimal" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -354,6 +364,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:string" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -366,6 +378,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:string" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -376,6 +390,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
 						type="xs:anyURI" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -540,8 +556,6 @@
 				minOccurs="0" maxOccurs="1" />
 			<xs:element name="canCreateRelationship" type="xs:boolean"
 				minOccurs="0" maxOccurs="1" />
-			<xs:element name="canCreatePolicy" type="xs:boolean"
-				minOccurs="0" maxOccurs="1" />
 			<xs:element name="canDeleteTree" type="xs:boolean"
 				minOccurs="0" maxOccurs="1" />
 
@@ -626,6 +640,7 @@
 						type="cmis:cmisPropertyBoolean" />
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
 						type="cmis:cmisChoiceBoolean" />
+
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -666,7 +681,8 @@
 				<xs:sequence>
 					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
 						type="cmis:cmisPropertyDateTime" />
-					<xs:element minOccurs="0" maxOccurs="1" name="resolution" type="cmis:enumDateTimeResolution"
/>
+					<xs:element minOccurs="0" maxOccurs="1" name="resolution"
+						type="cmis:enumDateTimeResolution" />
 					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
 						type="cmis:cmisChoiceDateTime" />
 
@@ -858,8 +874,6 @@
 	<!--  query -->
 	<xs:complexType name="cmisQueryType">
 		<xs:sequence>
-			<xs:element name="repositoryId" type="xs:string"
-				minOccurs="0" maxOccurs="1" />
 			<xs:element name="statement" type="xs:string" minOccurs="1"
 				maxOccurs="1" />
 			<xs:element name="searchAllVersions" type="xs:boolean"
@@ -907,7 +921,7 @@
 				minOccurs="1" maxOccurs="1" />
 			<xs:element name="aclCapability" type="cmis:cmisACLCapabilityType"
 				minOccurs="0" maxOccurs="1" />
-			<xs:element name="cmisVersionSupported" type="xs:decimal"
+			<xs:element name="cmisVersionSupported" type="xs:string"
 				minOccurs="1" maxOccurs="1" />
 			<xs:element name="thinClientURI" type="xs:anyURI"
 				minOccurs="0" maxOccurs="1" />
@@ -1088,14 +1102,10 @@
 			<xs:enumeration value="canGetChildren.Folder" />
 			<xs:enumeration value="canGetParents.Folder" />
 			<xs:enumeration value="canGetFolderParent.Object" />
-			<xs:enumeration value="canCreateDocument.Type" />
 			<xs:enumeration value="canCreateDocument.Folder" />
-			<xs:enumeration value="canCreateFolder.Type" />
 			<xs:enumeration value="canCreateFolder.Folder" />
-			<xs:enumeration value="canCreateRelationship.Type" />
 			<xs:enumeration value="canCreateRelationship.Source" />
 			<xs:enumeration value="canCreateRelationship.Target" />
-			<xs:enumeration value="canCreatePolicy.Type" />
 			<xs:enumeration value="canGetProperties.Object" />
 			<xs:enumeration value="canViewContent.Object" />
 			<xs:enumeration value="canUpdateProperties.Object" />
@@ -1170,8 +1180,10 @@
 		</xs:sequence>
 	</xs:complexType>
 
+
 	<xs:complexType name="cmisACLCapabilityType">
 		<xs:sequence>
+			<xs:element name="supportedPermissions" type="cmis:enumSupportedPermissions" />
 			<xs:element name="propagation" type="cmis:enumACLPropagation" />
 			<xs:element name="permissions" type="cmis:cmisPermissionDefinition"
 				minOccurs="1" maxOccurs="unbounded" />
@@ -1180,6 +1192,14 @@
 		</xs:sequence>
 	</xs:complexType>
 
+	<xs:simpleType name="enumSupportedPermissions">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="basic" />
+			<xs:enumeration value="repository" />
+			<xs:enumeration value="both" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<!-- renditions -->
 	<xs:simpleType name="enumCapabilityRendition">
 		<xs:restriction base="xs:string">

Modified: incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Messaging.xsd
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Messaging.xsd?rev=912593&r1=912592&r2=912593&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Messaging.xsd
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-Messaging.xsd
Mon Feb 22 14:49:35 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 	<!--
-		$Revision: 135 $
-		$Date: 2009-10-19 10:59:00 -0700 (Mon, 19 Oct 2009) $
+		$Revision: 147 $
+		$Date: 2009-12-21 21:31:42 -0800 (Mon, 21 Dec 2009) $
 		$Author: albertcbrown $
 		$HeadURL: http://tools.oasis-open.org/version-control/svn/cmis/trunk/SchemaProject/schema/CMIS-Messaging.xsd
$
 	-->
@@ -366,7 +366,7 @@
 					minOccurs="0" maxOccurs="1" nillable="true" />
 				<xs:element name="renditionFilter" type="xs:string"
 					minOccurs="0" maxOccurs="1" nillable="true" />
-				<xs:element name="includePathSegments" type="xs:boolean"
+				<xs:element name="includePathSegment" type="xs:boolean"
 					minOccurs="0" maxOccurs="1" nillable="true" />
 
 				<xs:element name="extension" type="cmism:cmisExtensionType"
@@ -411,7 +411,7 @@
 					minOccurs="0" maxOccurs="1" nillable="true" />
 				<xs:element name="renditionFilter" type="xs:string"
 					minOccurs="0" maxOccurs="1" nillable="true" />
-				<xs:element name="includePathSegments" type="xs:boolean"
+				<xs:element name="includePathSegment" type="xs:boolean"
 					minOccurs="0" maxOccurs="1" nillable="true" />
 
 				<xs:element name="extension" type="cmism:cmisExtensionType"
@@ -456,7 +456,7 @@
 					minOccurs="0" maxOccurs="1" nillable="true" />
 				<xs:element name="renditionFilter" type="xs:string"
 					minOccurs="0" maxOccurs="1" nillable="true" />
-				<xs:element name="includePathSegments" type="xs:boolean"
+				<xs:element name="includePathSegment" type="xs:boolean"
 					minOccurs="0" maxOccurs="1" nillable="true" />
 				<xs:element name="maxItems" type="xs:integer" minOccurs="0"
 					maxOccurs="1" nillable="true" />
@@ -1253,7 +1253,7 @@
 					maxOccurs="1" />
 				<xs:element name="allVersions" type="xs:boolean"
 					minOccurs="0" maxOccurs="1" nillable="true" />
-				<xs:element name="unfileObject" type="cmis:enumUnfileObject"
+				<xs:element name="unfileObjects" type="cmis:enumUnfileObject"
 					minOccurs="0" maxOccurs="1" nillable="true" />
 				<xs:element name="continueOnFailure" type="xs:boolean"
 					minOccurs="0" maxOccurs="1" nillable="true" />

Modified: incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-RestAtom.xsd
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-RestAtom.xsd?rev=912593&r1=912592&r2=912593&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-RestAtom.xsd
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/CMIS-RestAtom.xsd
Mon Feb 22 14:49:35 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	<!--
-		$Revision: 135 $ $Date: 2009-10-19 10:59:00 -0700 (Mon, 19 Oct 2009) $
+		$Revision: 172 $ $Date: 2010-02-11 19:32:39 -0800 (Thu, 11 Feb 2010) $
 		$Author: albertcbrown $ $HeadURL:
 		http://tools.oasis-open.org/version-control/svn/cmis/trunk/SchemaProject/schema/CMIS-RestAtom.xsd
 		$
@@ -14,23 +14,21 @@
 	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/"
 	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
 	version="1.0">
-	
+
 	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200908/"
 		schemaLocation="CMIS-Core.xsd" />
-	<xs:import namespace="http://www.w3.org/2005/Atom"
-		schemaLocation="ATOM.xsd" />
-
 
 	<xs:attribute name="id" type="xs:string">
 		<xs:annotation>
 			<xs:documentation>
-				This attribute MAY be used on XML elements that refer to a CMIS resources.  Examples
are:
+				This attribute MAY be used on XML elements that
+				refer to a CMIS resources. Examples are:
 				- atom:link
 				- cmis:type
 			</xs:documentation>
 		</xs:annotation>
 	</xs:attribute>
-	
+
 	<xs:attribute name="renditionKind" type="xs:string">
 		<xs:annotation>
 			<xs:documentation>
@@ -81,11 +79,20 @@
 	</xs:element>
 
 
-	<xs:element name="children" type="atom:feedType">
+	<xs:complexType name="cmisChildrenType">
+		<xs:sequence>
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<xs:element name="children" type="cmisra:cmisChildrenType">
 		<xs:annotation>
 			<xs:documentation>
 				This is the Atom extension element that will be
-				used to contain a feed inside an atom entry element.
+				used to contain a feed inside an atom entry element. This element
+				MUST contain an atom:feed element.
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
@@ -133,7 +140,9 @@
 			<xs:any processContents="lax" namespace="##other" minOccurs="0"
 				maxOccurs="unbounded" />
 		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
 	</xs:complexType>
+	
 	<xs:element name="uritemplate" type="cmisra:cmisUriTemplateType">
 		<xs:annotation>
 			<xs:documentation>
@@ -187,6 +196,7 @@
 			<xs:any processContents="lax" namespace="##other" minOccurs="0"
 				maxOccurs="unbounded" />
 		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
 	</xs:complexType>
 
 	<xs:element name="content" type="cmisra:cmisContentType">
@@ -215,7 +225,8 @@
 			<xs:enumeration value="this">
 				<xs:annotation>
 					<xs:documentation>
-						This is getObject service for the version specified
+						This is getObject service for the version
+						specified
 			</xs:documentation>
 				</xs:annotation>
 
@@ -387,17 +398,19 @@
 			<xs:enumeration value="length" />
 			<xs:enumeration value="major" />
 			<xs:enumeration value="maxItems" />
-      		<xs:enumeration value="overwriteFlag" />
-			<xs:enumeration value="removeFrom" />
+			<xs:enumeration value="overwriteFlag" />
 			<xs:enumeration value="relationshipDirection" />
 			<xs:enumeration value="relationshipType" />
+			<xs:enumeration value="renditionFilter" />
+			<xs:enumeration value="removeFrom" />
 			<xs:enumeration value="repositoryId" />
 			<xs:enumeration value="returnVersion" />
 			<xs:enumeration value="skipCount" />
+			<xs:enumeration value="sourceFolderId" />
 			<xs:enumeration value="thisVersion" />
 			<xs:enumeration value="typeId" />
 			<xs:enumeration value="types" />
-			<xs:enumeration value="unfileObject" />
+			<xs:enumeration value="unfileObjects" />
 			<xs:enumeration value="versioningState" />
 		</xs:restriction>
 	</xs:simpleType>



Mime
View raw message