- add DataContract attributes

- fix Audit schema

Source/EntityFramework.Extended/Audit/Audit.xsd

@@ -1,57 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xs ="http://www.w3.org/2001/XMLSchema"
-            attributeFormDefault="unqualified"
-            elementFormDefault="qualified"
-            xmlns="http://schemas.tempuri.org/ef/audit/1.0"
-            targetNamespace="http://schemas.tempuri.org/ef/audit/1.0">
-
-  <xs:element name="audit" type="AuditLog">
-    <xs:annotation>
-      <xs:documentation>The root of the audit log.</xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:complexType name="AuditLog">
-    <xs:sequence minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="entity" type="AuditEntity" />
-    </xs:sequence>
-    <xs:attribute name="username" type="xs:string" use="optional" />
-    <xs:attribute name="date" type="xs:dateTime" use="optional" />
-  </xs:complexType>
-
-  <xs:complexType name="AuditEntity">
-    <xs:sequence>
-      <xs:element name="key" type="AuditKey" minOccurs="0" maxOccurs="unbounded" />
-      <xs:element name="property" type="AuditProperty" minOccurs="0" maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:attribute name="action" type="AuditAction" use="required" />
-    <xs:attribute name="type" type="xs:string" use="required" />
-  </xs:complexType>
-
-  <xs:complexType name="AuditKey">
-    <xs:sequence minOccurs="0">
-      <xs:element minOccurs="0" name="value" />
-    </xs:sequence>
-    <xs:attribute name="name" type="xs:string" use="required" />
-    <xs:attribute name="type" type="xs:string" use="optional" />
-  </xs:complexType>
-
-  <xs:complexType name="AuditProperty">
-    <xs:sequence minOccurs="0">
-      <xs:element minOccurs="0" name="current" />
-      <xs:element minOccurs="0" name="original" />
-    </xs:sequence>
-    <xs:attribute name="name" type="xs:string" use="required" />
-    <xs:attribute name="type" type="xs:string" use="optional" />
-  </xs:complexType>
-
-  <xs:simpleType name="AuditAction">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Added"/>
-      <xs:enumeration value="Modified"/>
-      <xs:enumeration value="Deleted"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-</xs:schema>
+<xsd:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+           xmlns:xs ="http://www.w3.org/2001/XMLSchema"
+           attributeFormDefault="unqualified"
+           elementFormDefault="qualified"
+           xmlns="http://schemas.tempuri.org/ef/audit/2.0"
+           targetNamespace="http://schemas.tempuri.org/ef/audit/2.0">
+
+  <xsd:element name="audit" type="AuditLog">
+    <xsd:annotation>
+      <xsd:documentation>The root of the audit log.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+
+  <xsd:complexType name="AuditLog">
+    <xsd:sequence>
+      <xsd:element name="username" type="xsd:string" />
+      <xsd:element name="date" type="xsd:dateTime" />
+      <xsd:element name="entities" type="AuditEntityCollection" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AuditEntityCollection">
+    <xsd:sequence>
+      <xsd:element name="entity" type="AuditEntity" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AuditEntity">
+    <xsd:sequence>
+      <xsd:element name="action" type="xsd:string" />
+      <xsd:element name="type" type="xsd:string" />
+      <xsd:element minOccurs="0" name="keys" type="AuditKeyCollection" />
+      <xsd:element minOccurs="0" name="properties" type="AuditPropertyCollection" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AuditKeyCollection">
+    <xsd:sequence>
+      <xsd:element name="key" type="AuditKey" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AuditPropertyCollection">
+    <xsd:sequence>
+      <xsd:element name="property" type="AuditProperty" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AuditKey">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string" />
+      <xsd:element minOccurs="0" name="type" type="xsd:string" />
+      <xsd:element minOccurs="0" name="value" type="xsd:anyType" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AuditProperty">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string" />
+      <xsd:element minOccurs="0" name="type" type="xsd:string" />
+      <xsd:element minOccurs="0" name="isRelationship" type="xsd:boolean" />
+      <xsd:element minOccurs="0" name="foreignKey" type="xsd:string" />
+      <xsd:element minOccurs="0" name="current" type="xsd:anyType" />
+      <xsd:element minOccurs="0" name="original" type="xsd:anyType" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:simpleType name="AuditAction">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="Added"/>
+      <xsd:enumeration value="Modified"/>
+      <xsd:enumeration value="Deleted"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+</xsd:schema>

Source/EntityFramework.Extended/Audit/AuditAction.cs

@@ -1,21 +1,27 @@
-namespace EntityFramework.Audit
+using System.Runtime.Serialization;
+
+namespace EntityFramework.Audit
 {
     /// <summary>
     /// A list of entity actions for the audit log.
     /// </summary>
+    [DataContract(Name = "action", Namespace = AuditLog.AuditNamespace)]
     public enum AuditAction
     {
         /// <summary>
         /// The entity was inserted/added.
         /// </summary>
+        [EnumMember]
         Added = 1,
         /// <summary>
         /// The entity was updated/modifed.
         /// </summary>
+        [EnumMember]
         Modified = 2,
         /// <summary>
         /// The entity was deleted.
         /// </summary>
+        [EnumMember]
         Deleted = 3
     }
 }

Source/EntityFramework.Extended/Audit/AuditEntity.cs

@@ -3,6 +3,7 @@
 using System.Data.Entity.Core.Objects;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using EntityFramework.Audit;
 
@@ -12,6 +13,7 @@ namespace EntityFramework.Audit
     /// A class for logging the changes to an entity.
     /// </summary>
     [XmlRoot(Namespace = AuditLog.AuditNamespace, ElementName = "entity")]
+    [DataContract(Name = "entity", Namespace = AuditLog.AuditNamespace)]
     [DebuggerDisplay("Action: {Action}, Type: {Type}")]
     public class AuditEntity : IEquatable<AuditEntity>
     {
@@ -47,21 +49,25 @@ public AuditEntity(object current)
         /// Gets or sets the action that was taken on the entity.
         /// </summary>
         /// <value>The action that was taken on the entity.</value>
-        [XmlAttribute("action")]
+        [XmlElement("action")]
+        [DataMember(Name = "action", Order = 0)]
         public AuditAction Action { get; set; }
 
         /// <summary>
         /// Gets or sets the data type of the entity.
         /// </summary>
         /// <value>The data type of the entity.</value>
-        [XmlAttribute("type")]
+        [XmlElement("type")]
+        [DataMember(Name = "type", Order = 1)]
         public string Type { get; set; }
 
         /// <summary>
         /// Gets the list of properties that are the key for the entity.
         /// </summary>
         /// <value>The list of properties that are the key for the entity.</value>
-        [XmlElement("key", typeof(AuditKey))]
+        [XmlArray("keys")]
+        [XmlArrayItem("key")]
+        [DataMember(Name = "keys", Order = 2)]
         public AuditKeyCollection Keys { get; set; }
 
         /// <summary>
@@ -89,7 +95,9 @@ public Type EntityType
         /// Gets the list of properties that action was taken on.
         /// </summary>
         /// <value>The list of properties that action was taken on.</value>
-        [XmlElement("property", typeof(AuditProperty))]
+        [XmlArray("properties")]
+        [XmlArrayItem("property")]
+        [DataMember(Name = "properties", Order = 3)]
         public AuditPropertyCollection Properties { get; set; }
 
         /// <summary>

Source/EntityFramework.Extended/Audit/AuditKey.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Runtime.Serialization;
 using System.Xml.Serialization;
 
 namespace EntityFramework.Audit
@@ -7,28 +8,32 @@ namespace EntityFramework.Audit
     /// A class used to hold audit key values.
     /// </summary>
     [XmlRoot(Namespace = AuditLog.AuditNamespace, ElementName = "key")]
+    [DataContract(Name = "key", Namespace = AuditLog.AuditNamespace)]
     [DebuggerDisplay("Name: {Name}, Value: {Value}")]
     public class AuditKey
     {
         /// <summary>
         /// Gets or sets the name of the property.
         /// </summary>
         /// <value>The name of the property.</value>
-        [XmlAttribute("name")]
+        [XmlElement("name")]
+        [DataMember(Name = "name", Order = 0)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the property.
         /// </summary>
         /// <value>The type of the property.</value>
-        [XmlAttribute("type")]
+        [XmlElement("type")]
+        [DataMember(Name = "type", Order = 1)]
         public string Type { get; set; }
 
         /// <summary>
         /// Gets or sets the current/changed value of the property.
         /// </summary>
         /// <value>The current value of the property.</value>
         [XmlElement("value")]
+        [DataMember(Name = "value", Order = 2)]
         public object Value { get; set; }
     }
 }

Source/EntityFramework.Extended/Audit/AuditKeyCollection.cs

@@ -1,10 +1,12 @@
 using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
 
 namespace EntityFramework.Audit
 {
     /// <summary>
     /// A keyed collection of <see cref="AuditKey"/>
     /// </summary>
+    [CollectionDataContract(Name = "keys", ItemName = "key", Namespace = AuditLog.AuditNamespace)]
     public class AuditKeyCollection : KeyedCollection<string, AuditKey>
     {
         /// <summary>

Source/EntityFramework.Extended/Audit/AuditLog.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
@@ -13,12 +14,13 @@ namespace EntityFramework.Audit
     /// A class representing a log of the changes.
     /// </summary>
     [XmlRoot(Namespace = AuditNamespace, ElementName = "audit")]
+    [DataContract(Name = "audit", Namespace = AuditNamespace)]
     public class AuditLog
     {
         /// <summary>
         /// The schema namespace for the audit log.
         /// </summary>
-        public const string AuditNamespace = "http://schemas.tempuri.org/ef/audit/1.0";
+        public const string AuditNamespace = "http://schemas.tempuri.org/ef/audit/2.0";
 
         private static readonly Lazy<XmlSerializer> _serializer;
 
@@ -40,21 +42,25 @@ public AuditLog()
         /// Gets or sets the user name that made the changes.
         /// </summary>
         /// <value>The user name that made the changes.</value>
-        [XmlAttribute("username")]
+        [XmlElement("username")]
+        [DataMember(Name = "username", Order = 0)]
         public string Username { get; set; }
 
         /// <summary>
         /// Gets or sets the date when the changes were made.
         /// </summary>
         /// <value>The date when the changes were made.</value>
-        [XmlAttribute("date")]
+        [XmlElement("date")]
+        [DataMember(Name = "date", Order = 1)]
         public DateTime Date { get; set; }
 
         /// <summary>
         /// Gets the list entities that have changes.
         /// </summary>
         /// <value>The list entities that have changes.</value>
-        [XmlElement("entity", typeof(AuditEntity))]
+        [XmlArray("entities")]
+        [XmlArrayItem("entity")]
+        [DataMember(Name = "entities", Order = 2)]
         public List<AuditEntity> Entities { get; set; }
 
         /// <summary>

Source/EntityFramework.Extended/Audit/AuditProperty.cs

@@ -9,21 +9,24 @@ namespace EntityFramework.Audit
     /// A class for logging the changes to a property on an entity.
     /// </summary>
     [XmlRoot(Namespace = AuditLog.AuditNamespace, ElementName = "property")]
+    [DataContract(Name = "property", Namespace = AuditLog.AuditNamespace)]
     [DebuggerDisplay("Name: {Name}, Type: {Type}")]
     public class AuditProperty
     {
         /// <summary>
         /// Gets or sets the name of the property.
         /// </summary>
         /// <value>The name of the property.</value>
-        [XmlAttribute("name")]
+        [XmlElement("name")]
+        [DataMember(Name = "name", Order = 0)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the property.
         /// </summary>
         /// <value>The type of the property.</value>
-        [XmlAttribute("type")]
+        [XmlElement("type")]
+        [DataMember(Name = "type", Order = 1)]
         public string Type { get; set; }
 
         /// <summary>
@@ -32,29 +35,33 @@ public class AuditProperty
         /// <value>
         /// 	<c>true</c> if this property is an association; otherwise, <c>false</c>.
         /// </value>
-        [XmlAttribute("isRelationship")]
+        [XmlElement("isRelationship")]
         [DefaultValue(false)]
+        [DataMember(Name = "isRelationship", Order = 2, EmitDefaultValue = false)]
         public bool IsRelationship { get; set; }
 
         /// <summary>
         /// Gets or sets the property names that this association maps to.
         /// </summary>
         /// <value>The property names that this association maps to..</value>
-        [XmlAttribute("foreignKey")]
+        [XmlElement("foreignKey")]
+        [DataMember(Name = "foreignKey", Order = 3, EmitDefaultValue = false)]
         public string ForeignKey { get; set; }
 
         /// <summary>
         /// Gets or sets the current/changed value of the property.
         /// </summary>
         /// <value>The current value of the property.</value>
         [XmlElement("current")]
+        [DataMember(Name = "current", Order = 4, EmitDefaultValue = false)]
         public object Current { get; set; }
 
         /// <summary>
         /// Gets or sets the original value of the property.
         /// </summary>
         /// <value>The original value of the property.</value>
         [XmlElement("original")]
+        [DataMember(Name = "original", Order = 5, EmitDefaultValue = false)]
         public object Original { get; set; }
     }
 }