Author: fmui
Date: Wed Oct 12 12:38:06 2011
New Revision: 1182333
URL: http://svn.apache.org/viewvc?rev=1182333&view=rev
Log:
Another attempt to fix CMIS-380
Modified:
chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/CMIS-Core.xsd
chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/Reference.cs
chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs
chemistry/dotcmis/trunk/DotCMIS/binding/converter.cs
chemistry/dotcmis/trunk/DotCMIS/wsdl/CMIS-Core.xsd
Modified: chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/CMIS-Core.xsd
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/Service%20References/CMISWebServicesReference/CMIS-Core.xsd?rev=1182333&r1=1182332&r2=1182333&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/CMIS-Core.xsd (original)
+++ chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/CMIS-Core.xsd Wed Oct 12 12:38:06 2011
@@ -459,6 +459,7 @@
<xs:element minOccurs="1" maxOccurs="1" name="queryable" type="xs:boolean" />
<xs:element minOccurs="1" maxOccurs="1" name="orderable" type="xs:boolean" />
<xs:element minOccurs="0" maxOccurs="1" name="openChoice" type="xs:boolean" />
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
</xs:complexType>
@@ -468,7 +469,6 @@
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="1" name="defaultValue" type="cmis:cmisPropertyBoolean" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice" type="cmis:cmisChoiceBoolean" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -479,7 +479,6 @@
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="1" name="defaultValue" type="cmis:cmisPropertyId" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice" type="cmis:cmisChoiceId" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -492,7 +491,6 @@
<xs:element minOccurs="0" maxOccurs="1" name="maxValue" type="xs:integer" />
<xs:element minOccurs="0" maxOccurs="1" name="minValue" type="xs:integer" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice" type="cmis:cmisChoiceInteger" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -504,7 +502,6 @@
<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="unbounded" name="choice" type="cmis:cmisChoiceDateTime" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -518,7 +515,6 @@
<xs:element minOccurs="0" maxOccurs="1" name="minValue" type="xs:decimal" />
<xs:element minOccurs="0" maxOccurs="1" name="precision" type="cmis:enumDecimalPrecision" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice" type="cmis:cmisChoiceDecimal" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -529,7 +525,6 @@
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="1" name="defaultValue" type="cmis:cmisPropertyHtml" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice" type="cmis:cmisChoiceHtml" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -541,7 +536,6 @@
<xs:element minOccurs="0" maxOccurs="1" name="defaultValue" type="cmis:cmisPropertyString" />
<xs:element minOccurs="0" maxOccurs="1" name="maxLength" type="xs:integer" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice" type="cmis:cmisChoiceString" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -552,7 +546,6 @@
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="1" name="defaultValue" type="cmis:cmisPropertyUri" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice" type="cmis:cmisChoiceUri" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -572,7 +565,7 @@
This is the id for the parent type definition. If
this is a base type,
this is not present.
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="1" maxOccurs="1" name="creatable" type="xs:boolean" />
@@ -597,6 +590,7 @@
<xs:element name="propertyStringDefinition" type="cmis:cmisPropertyStringDefinitionType" />
<xs:element name="propertyUriDefinition" type="cmis:cmisPropertyUriDefinitionType" />
</xs:choice>
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
</xs:complexType>
@@ -606,7 +600,6 @@
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="versionable" type="xs:boolean" />
<xs:element minOccurs="1" maxOccurs="1" name="contentStreamAllowed" type="cmis:enumContentStreamAllowed" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -614,9 +607,7 @@
<xs:complexType name="cmisTypeFolderDefinitionType">
<xs:complexContent mixed="false">
<xs:extension base="cmis:cmisTypeDefinitionType">
- <xs:sequence>
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
- </xs:sequence>
+ <xs:sequence />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -626,7 +617,6 @@
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="allowedSourceTypes" type="xs:string" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="allowedTargetTypes" type="xs:string" />
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -634,9 +624,7 @@
<xs:complexType name="cmisTypePolicyDefinitionType">
<xs:complexContent mixed="false">
<xs:extension base="cmis:cmisTypeDefinitionType">
- <xs:sequence>
- <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
- </xs:sequence>
+ <xs:sequence />
</xs:extension>
</xs:complexContent>
</xs:complexType>
Modified: chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/Reference.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/Service%20References/CMISWebServicesReference/Reference.cs?rev=1182333&r1=1182332&r2=1182333&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/Reference.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/Service References/CMISWebServicesReference/Reference.cs Wed Oct 12 12:38:06 2011
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.225
+// Runtime Version:4.0.30319.237
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@ namespace DotCMIS.CMISWebServicesReferen
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -86,7 +86,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/messaging/200908/")]
public enum enumServiceException {
@@ -132,7 +132,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -276,7 +276,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -336,7 +336,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -382,7 +382,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -456,7 +456,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -502,7 +502,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -562,7 +562,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumTypeOfChanges {
@@ -581,7 +581,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1447,7 +1447,7 @@ namespace DotCMIS.CMISWebServicesReferen
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisPropertyInteger))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisPropertyId))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisPropertyBoolean))]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1535,7 +1535,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1572,7 +1572,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1609,7 +1609,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1646,7 +1646,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1683,7 +1683,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1720,7 +1720,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1757,7 +1757,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1794,7 +1794,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1831,7 +1831,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1898,7 +1898,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2070,7 +2070,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2158,7 +2158,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2209,7 +2209,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumIncludeRelationships {
@@ -2674,7 +2674,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2748,7 +2748,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2896,7 +2896,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3188,7 +3188,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3679,7 +3679,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3781,7 +3781,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumVersioningState {
@@ -4673,7 +4673,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumUnfileObject {
@@ -4689,7 +4689,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5503,7 +5503,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumRelationshipDirection {
@@ -5685,7 +5685,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5795,7 +5795,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6079,7 +6079,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6321,7 +6321,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumCapabilityACL {
@@ -6337,7 +6337,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumCapabilityChanges {
@@ -6356,7 +6356,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumCapabilityContentStreamUpdates {
@@ -6372,7 +6372,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumCapabilityQuery {
@@ -6394,7 +6394,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumCapabilityRendition {
@@ -6407,7 +6407,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumCapabilityJoin {
@@ -6423,7 +6423,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6497,7 +6497,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumSupportedPermissions {
@@ -6513,7 +6513,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumACLPropagation {
@@ -6529,7 +6529,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6589,7 +6589,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6649,7 +6649,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumAllowableActionsKey {
@@ -6792,7 +6792,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumBaseObjectTypeIds {
@@ -6854,7 +6854,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6946,7 +6946,7 @@ namespace DotCMIS.CMISWebServicesReferen
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisTypeRelationshipDefinitionType))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisTypeFolderDefinitionType))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisTypeDocumentDefinitionType))]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6985,6 +6985,8 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisPropertyDefinitionType[] itemsField;
+ private System.Xml.XmlElement[] anyField;
+
private System.Xml.XmlAttribute[] anyAttrField;
public cmisTypeDefinitionType() {
@@ -7191,6 +7193,18 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
+ [System.Xml.Serialization.XmlAnyElementAttribute(Order=16)]
+ public System.Xml.XmlElement[] Any {
+ get {
+ return this.anyField;
+ }
+ set {
+ this.anyField = value;
+ this.RaisePropertyChanged("Any");
+ }
+ }
+
+ /// <remarks/>
[System.Xml.Serialization.XmlAnyAttributeAttribute()]
public System.Xml.XmlAttribute[] AnyAttr {
get {
@@ -7213,7 +7227,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7224,8 +7238,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceBoolean[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyBoolean defaultValue {
@@ -7249,22 +7261,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=2)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7309,7 +7309,7 @@ namespace DotCMIS.CMISWebServicesReferen
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisChoiceInteger))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisChoiceId))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisChoiceBoolean))]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7355,7 +7355,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7392,7 +7392,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7429,7 +7429,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7466,7 +7466,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7503,7 +7503,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7540,7 +7540,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7577,7 +7577,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7622,7 +7622,7 @@ namespace DotCMIS.CMISWebServicesReferen
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisPropertyIntegerDefinitionType))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisPropertyIdDefinitionType))]
[System.Xml.Serialization.XmlIncludeAttribute(typeof(cmisPropertyBooleanDefinitionType))]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7661,6 +7661,8 @@ namespace DotCMIS.CMISWebServicesReferen
private bool openChoiceFieldSpecified;
+ private System.Xml.XmlElement[] anyField;
+
private System.Xml.XmlAttribute[] anyAttrField;
/// <remarks/>
@@ -7856,6 +7858,18 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
+ [System.Xml.Serialization.XmlAnyElementAttribute(Order=14)]
+ public System.Xml.XmlElement[] Any {
+ get {
+ return this.anyField;
+ }
+ set {
+ this.anyField = value;
+ this.RaisePropertyChanged("Any");
+ }
+ }
+
+ /// <remarks/>
[System.Xml.Serialization.XmlAnyAttributeAttribute()]
public System.Xml.XmlAttribute[] AnyAttr {
get {
@@ -7878,7 +7892,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumPropertyType {
@@ -7909,7 +7923,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumCardinality {
@@ -7922,7 +7936,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumUpdatability {
@@ -7941,7 +7955,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7952,8 +7966,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceUri[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyUri defaultValue {
@@ -7977,22 +7989,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=2)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8005,8 +8005,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceString[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyString defaultValue {
@@ -8042,22 +8040,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=3)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8068,8 +8054,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceHtml[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyHtml defaultValue {
@@ -8093,22 +8077,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=2)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8131,8 +8103,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceDecimal[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyDecimal defaultValue {
@@ -8228,22 +8198,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=5)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumDecimalPrecision {
@@ -8258,7 +8216,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8273,8 +8231,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceDateTime[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyDateTime defaultValue {
@@ -8322,22 +8278,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=3)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumDateTimeResolution {
@@ -8353,7 +8297,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8368,8 +8312,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceInteger[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyInteger defaultValue {
@@ -8417,22 +8359,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=4)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8443,8 +8373,6 @@ namespace DotCMIS.CMISWebServicesReferen
private cmisChoiceId[] choiceField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public cmisPropertyId defaultValue {
@@ -8468,45 +8396,19 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("choice");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=2)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public partial class cmisTypePolicyDefinitionType : cmisTypeDefinitionType {
-
- private System.Xml.XmlElement[] anyField;
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=0)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8517,8 +8419,6 @@ namespace DotCMIS.CMISWebServicesReferen
private string[] allowedTargetTypesField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute("allowedSourceTypes", Order=0)]
public string[] allowedSourceTypes {
@@ -8542,45 +8442,19 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("allowedTargetTypes");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=2)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public partial class cmisTypeFolderDefinitionType : cmisTypeDefinitionType {
-
- private System.Xml.XmlElement[] anyField;
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=0)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8591,8 +8465,6 @@ namespace DotCMIS.CMISWebServicesReferen
private enumContentStreamAllowed contentStreamAllowedField;
- private System.Xml.XmlElement[] anyField;
-
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Order=0)]
public bool versionable {
@@ -8616,22 +8488,10 @@ namespace DotCMIS.CMISWebServicesReferen
this.RaisePropertyChanged("contentStreamAllowed");
}
}
-
- /// <remarks/>
- [System.Xml.Serialization.XmlAnyElementAttribute(Order=2)]
- public System.Xml.XmlElement[] Any {
- get {
- return this.anyField;
- }
- set {
- this.anyField = value;
- this.RaisePropertyChanged("Any");
- }
- }
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://docs.oasis-open.org/ns/cmis/core/200908/")]
public enum enumContentStreamAllowed {
@@ -8706,7 +8566,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9539,7 +9399,7 @@ namespace DotCMIS.CMISWebServicesReferen
}
/// <remarks/>
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.1")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.233")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs?rev=1182333&r1=1182332&r2=1182333&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/atompub/atompub-parser.cs Wed Oct 12 12:38:06 2011
@@ -49,11 +49,11 @@ namespace DotCMIS.Binding.AtomPub
XmlRootAttribute allowableActionsXmlRoot = new XmlRootAttribute("allowableActions");
allowableActionsXmlRoot.Namespace = AtomPubConstants.NamespaceRestAtom;
- AllowableActionsSerializer = new XmlSerializer(typeof(cmisAllowableActionsType), objectXmlRoot);
+ AllowableActionsSerializer = new XmlSerializer(typeof(cmisAllowableActionsType), allowableActionsXmlRoot);
XmlRootAttribute aclXmlRoot = new XmlRootAttribute("accessControlList");
aclXmlRoot.Namespace = AtomPubConstants.NamespaceRestAtom;
- AclSerializer = new XmlSerializer(typeof(cmisAccessControlListType), objectXmlRoot);
+ AclSerializer = new XmlSerializer(typeof(cmisAccessControlListType), aclXmlRoot);
}
private Stream stream;
Modified: chemistry/dotcmis/trunk/DotCMIS/binding/converter.cs
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/binding/converter.cs?rev=1182333&r1=1182332&r2=1182333&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/binding/converter.cs (original)
+++ chemistry/dotcmis/trunk/DotCMIS/binding/converter.cs Wed Oct 12 12:38:06 2011
@@ -27,11 +27,84 @@ using DotCMIS.Data;
using DotCMIS.Data.Extensions;
using DotCMIS.Data.Impl;
using DotCMIS.Enums;
+using DotCMIS.Exceptions;
namespace DotCMIS.Binding
{
internal class Converter
{
+ private const string CMISNamespaceURI = "http://docs.oasis-open.org/ns/cmis/core/200908/";
+
+ private delegate void ProcessAnyElement(XmlElement element);
+
+ /// <summary>
+ /// Walks through CMIS Any elements.
+ /// </summary>
+ private static void ProcessAnyElements(XmlElement[] any, ProcessAnyElement proc)
+ {
+ try
+ {
+ if (any != null)
+ {
+ foreach (XmlElement element in any)
+ {
+ if (element.NamespaceURI.Equals(CMISNamespaceURI) && element.FirstChild != null)
+ {
+ proc(element);
+ }
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new CmisRuntimeException(e.Message, e);
+ }
+ }
+
+ /// <summary>
+ /// Deserializes a string.
+ /// </summary>
+ private static string DeserializeString(XmlElement element)
+ {
+ return element.FirstChild.Value;
+ }
+
+ /// <summary>
+ /// Deserializes an integer.
+ /// </summary>
+ private static long? DeserializeInteger(XmlElement element)
+ {
+ string s = DeserializeString(element);
+ return s == null ? (long?)null : Int64.Parse(s);
+ }
+
+ /// <summary>
+ /// Deserializes a boolean.
+ /// </summary>
+ private static Boolean DeserializeBoolean(XmlElement element)
+ {
+ return "true".Equals(DeserializeString(element), StringComparison.OrdinalIgnoreCase);
+ }
+
+ /// <summary>
+ /// Deserializes an enum.
+ /// </summary>
+ private static T DeserializeEnum<T>(XmlElement element)
+ {
+ return CmisValue.GetCmisEnum<T>(DeserializeString(element));
+ }
+
+ /// <summary>
+ /// Deserializes an elemenet.
+ /// </summary>
+ private static T DeserializeElement<T>(XmlElement element)
+ {
+ XmlRootAttribute xmlRoot = new XmlRootAttribute(element.LocalName);
+ xmlRoot.Namespace = CMISNamespaceURI;
+ XmlSerializer s = new XmlSerializer(typeof(T), xmlRoot);
+ return (T)s.Deserialize(new XmlNodeReader(element));
+ }
+
/// <summary>
/// Converts a repository info.
/// </summary>
@@ -172,6 +245,18 @@ namespace DotCMIS.Binding
docType.IsVersionable = docTypeDef.versionable;
docType.ContentStreamAllowed = (ContentStreamAllowed)CmisValue.SerializerToCmisEnum(docTypeDef.contentStreamAllowed);
+ ProcessAnyElements(docTypeDef.Any, (element) =>
+ {
+ if (element.LocalName.Equals("versionable"))
+ {
+ docType.IsVersionable = DeserializeBoolean(element);
+ }
+ else if (element.LocalName.Equals("contentStreamAllowed"))
+ {
+ docType.ContentStreamAllowed = DeserializeEnum<ContentStreamAllowed>(element);
+ }
+ });
+
result = docType;
}
else if (typeDef is cmisTypeFolderDefinitionType)
@@ -205,6 +290,26 @@ namespace DotCMIS.Binding
}
}
+ ProcessAnyElements(relTypeDef.Any, (element) =>
+ {
+ if (element.LocalName.Equals("allowedSourceTypes"))
+ {
+ if (relType.AllowedSourceTypeIds == null)
+ {
+ relType.AllowedSourceTypeIds = new List<string>();
+ }
+ relType.AllowedSourceTypeIds.Add(element.FirstChild.Value);
+ }
+ else if (element.LocalName.Equals("allowedTargetTypes"))
+ {
+ if (relType.AllowedTargetTypeIds == null)
+ {
+ relType.AllowedTargetTypeIds = new List<string>();
+ }
+ relType.AllowedTargetTypeIds.Add(element.FirstChild.Value);
+ }
+ });
+
result = relType;
}
@@ -258,6 +363,28 @@ namespace DotCMIS.Binding
foreach (cmisChoiceBoolean c in cpd.choice) { pd.Choices.Add(ConvertChoice(c)); }
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisPropertyBoolean prop = DeserializeElement<cmisPropertyBoolean>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<bool>();
+ foreach (bool value in prop.value) { pd.DefaultValue.Add(value); }
+ }
+ }
+ else if (element.LocalName.Equals("choice"))
+ {
+ cmisChoiceBoolean choice = DeserializeElement<cmisChoiceBoolean>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null) { pd.Choices = new List<IChoice<bool>>(); }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ });
+
result = pd;
}
else if (propDef is cmisPropertyDateTimeDefinitionType)
@@ -281,6 +408,32 @@ namespace DotCMIS.Binding
pd.DateTimeResolution = (DateTimeResolution)CmisValue.SerializerToCmisEnum(cpd.resolution);
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisChoiceDateTime prop = DeserializeElement<cmisChoiceDateTime>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<DateTime>();
+ foreach (DateTime value in prop.value) { pd.DefaultValue.Add(value); }
+ }
+ }
+ else if (element.LocalName.Equals("choiceDateTime"))
+ {
+ cmisChoiceDateTime choice = DeserializeElement<cmisChoiceDateTime>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null) { pd.Choices = new List<IChoice<DateTime>>(); }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ else if (element.LocalName.Equals("maxLength"))
+ {
+ pd.DateTimeResolution = DeserializeEnum<DateTimeResolution>(element);
+ }
+ });
+
result = pd;
}
else if (propDef is cmisPropertyDecimalDefinitionType)
@@ -312,6 +465,40 @@ namespace DotCMIS.Binding
pd.Precision = (DecimalPrecision)CmisValue.SerializerToCmisEnum(cpd.precision);
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisChoiceDecimal prop = DeserializeElement<cmisChoiceDecimal>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<decimal>();
+ foreach (decimal value in prop.value) { pd.DefaultValue.Add(value); }
+ }
+ }
+ else if (element.LocalName.Equals("choiceDateTime"))
+ {
+ cmisChoiceDecimal choice = DeserializeElement<cmisChoiceDecimal>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null) { pd.Choices = new List<IChoice<decimal>>(); }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ else if (element.LocalName.Equals("maxValue"))
+ {
+ pd.MaxValue = DeserializeInteger(element);
+ }
+ else if (element.LocalName.Equals("minValue"))
+ {
+ pd.MinValue = DeserializeInteger(element);
+ }
+ else if (element.LocalName.Equals("precision"))
+ {
+ pd.Precision = DeserializeEnum<DecimalPrecision>(element);
+ }
+ });
+
result = pd;
}
else if (propDef is cmisPropertyHtmlDefinitionType)
@@ -330,6 +517,28 @@ namespace DotCMIS.Binding
foreach (cmisChoiceHtml c in cpd.choice) { pd.Choices.Add(ConvertChoice(c)); }
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisPropertyHtml prop = DeserializeElement<cmisPropertyHtml>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<string>();
+ foreach (string value in prop.value) { pd.DefaultValue.Add(value); }
+ }
+ }
+ else if (element.LocalName.Equals("choiceHtml"))
+ {
+ cmisChoiceHtml choice = DeserializeElement<cmisChoiceHtml>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null) { pd.Choices = new List<IChoice<string>>(); }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ });
+
result = pd;
}
else if (propDef is cmisPropertyIdDefinitionType)
@@ -348,6 +557,28 @@ namespace DotCMIS.Binding
foreach (cmisChoiceId c in cpd.choice) { pd.Choices.Add(ConvertChoice(c)); }
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisPropertyId prop = DeserializeElement<cmisPropertyId>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<string>();
+ foreach (string value in prop.value) { pd.DefaultValue.Add(value); }
+ }
+ }
+ else if (element.LocalName.Equals("choiceId"))
+ {
+ cmisChoiceId choice = DeserializeElement<cmisChoiceId>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null) { pd.Choices = new List<IChoice<string>>(); }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ });
+
result = pd;
}
else if (propDef is cmisPropertyIntegerDefinitionType)
@@ -375,6 +606,28 @@ namespace DotCMIS.Binding
pd.MinValue = Int64.Parse(cpd.minValue);
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisPropertyInteger prop = DeserializeElement<cmisPropertyInteger>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<long>();
+ foreach (string value in prop.value) { pd.DefaultValue.Add(Int64.Parse(value)); }
+ }
+ }
+ else if (element.LocalName.Equals("choiceId"))
+ {
+ cmisChoiceInteger choice = DeserializeElement<cmisChoiceInteger>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null) { pd.Choices = new List<IChoice<long>>(); }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ });
+
result = pd;
}
else if (propDef is cmisPropertyStringDefinitionType)
@@ -398,6 +651,35 @@ namespace DotCMIS.Binding
pd.MaxLength = Int64.Parse(cpd.maxLength);
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisPropertyString prop = DeserializeElement<cmisPropertyString>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<string>();
+ foreach (string value in prop.value) { pd.DefaultValue.Add(value); }
+ }
+ }
+ else if (element.LocalName.Equals("choiceString"))
+ {
+ cmisChoiceString choice = DeserializeElement<cmisChoiceString>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null)
+ {
+ pd.Choices = new List<IChoice<string>>();
+ }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ else if (element.LocalName.Equals("maxLength"))
+ {
+ pd.MaxLength = DeserializeInteger(element);
+ }
+ });
+
result = pd;
}
else if (propDef is cmisPropertyUriDefinitionType)
@@ -416,6 +698,31 @@ namespace DotCMIS.Binding
foreach (cmisChoiceUri c in cpd.choice) { pd.Choices.Add(ConvertChoice(c)); }
}
+ ProcessAnyElements(cpd.Any, (element) =>
+ {
+ if (element.LocalName.Equals("defaultValue"))
+ {
+ cmisPropertyUri prop = DeserializeElement<cmisPropertyUri>(element);
+ if (prop != null && prop.value != null)
+ {
+ pd.DefaultValue = new List<string>();
+ foreach (string value in prop.value) { pd.DefaultValue.Add(value); }
+ }
+ }
+ else if (element.LocalName.Equals("choiceUri"))
+ {
+ cmisChoiceUri choice = DeserializeElement<cmisChoiceUri>(element);
+ if (choice != null)
+ {
+ if (pd.Choices == null)
+ {
+ pd.Choices = new List<IChoice<string>>();
+ }
+ pd.Choices.Add(ConvertChoice(choice));
+ }
+ }
+ });
+
result = pd;
}
Modified: chemistry/dotcmis/trunk/DotCMIS/wsdl/CMIS-Core.xsd
URL: http://svn.apache.org/viewvc/chemistry/dotcmis/trunk/DotCMIS/wsdl/CMIS-Core.xsd?rev=1182333&r1=1182332&r2=1182333&view=diff
==============================================================================
--- chemistry/dotcmis/trunk/DotCMIS/wsdl/CMIS-Core.xsd (original)
+++ chemistry/dotcmis/trunk/DotCMIS/wsdl/CMIS-Core.xsd Wed Oct 12 12:38:06 2011
@@ -12,10 +12,6 @@
the specific language governing permissions and limitations under the
License.
-->
-
- <!--
- This file has been modified to work around .NET issues.
- -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/ns/cmis/core/200908/"
@@ -635,6 +631,10 @@
<xs:element name="openChoice" type="xs:boolean" minOccurs="0"
maxOccurs="1" />
+
+ <!-- extension -->
+ <xs:any processContents="lax" namespace="##other" minOccurs="0"
+ maxOccurs="unbounded" />
</xs:sequence>
<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
</xs:complexType>
@@ -648,9 +648,7 @@
type="cmis:cmisPropertyBoolean" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceBoolean" />
- <!-- extension -->
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -663,8 +661,7 @@
type="cmis:cmisPropertyId" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceId" />
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -681,8 +678,7 @@
maxOccurs="1" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceInteger" />
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -697,8 +693,7 @@
type="cmis:enumDateTimeResolution" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceDateTime" />
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -717,8 +712,7 @@
minOccurs="0" maxOccurs="1" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceDecimal" />
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -731,8 +725,7 @@
type="cmis:cmisPropertyHtml" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceHtml" />
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -747,8 +740,7 @@
minOccurs="0" maxOccurs="1" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceString" />
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -761,8 +753,7 @@
type="cmis:cmisPropertyUri" />
<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
type="cmis:cmisChoiceUri" />
- <xs:any processContents="lax" namespace="##other" minOccurs="0"
- maxOccurs="unbounded" />
+
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -798,7 +789,7 @@
This is the id for the parent type definition. If
this is a base type,
this is not present.
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
@@ -837,6 +828,10 @@
<xs:element name="propertyStringDefinition" type="cmis:cmisPropertyStringDefinitionType" />
<xs:element name="propertyUriDefinition" type="cmis:cmisPropertyUriDefinitionType" />
</xs:choice>
+
+ <!-- extension -->
+ <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+ processContents="lax" />
</xs:sequence>
<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
</xs:complexType>
@@ -851,9 +846,6 @@
minOccurs="1" maxOccurs="1" />
<xs:element name="contentStreamAllowed" type="cmis:enumContentStreamAllowed"
minOccurs="1" maxOccurs="1" />
- <!-- extension -->
- <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
- processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -862,8 +854,6 @@
<xs:complexContent>
<xs:extension base="cmis:cmisTypeDefinitionType">
<xs:sequence>
- <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
- processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -876,8 +866,6 @@
minOccurs="0" maxOccurs="unbounded" />
<xs:element name="allowedTargetTypes" type="xs:string"
minOccurs="0" maxOccurs="unbounded" />
- <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
- processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -886,8 +874,6 @@
<xs:complexContent>
<xs:extension base="cmis:cmisTypeDefinitionType">
<xs:sequence>
- <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
- processContents="lax" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
|