[mapguide-commits] r4919 - in sandbox/maestro-2.5: Generated Maestro.Base Maestro.Base/Editor Maestro.Base/Services Maestro.Base/UI Maestro.Editors Maestro.Editors/Common Maestro.Editors/LayerDefinition Maestro.Editors/LayerDefinition/Vector OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/Feature OSGeo.MapGuide.MaestroAPI/ObjectModels

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri May 21 04:22:47 EDT 2010


Author: jng
Date: 2010-05-21 04:22:46 -0400 (Fri, 21 May 2010)
New Revision: 4919

Added:
   sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.Designer.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.Designer.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.resx
   sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.Designer.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.Designer.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.Designer.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.cs
   sandbox/maestro-2.5/Maestro.Editors/IEditorBindable.cs
   sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
Modified:
   sandbox/maestro-2.5/Generated/ApplicationDefinition-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/BatchPropertyCollection-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/DataStoreList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/DrawingSectionList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/DrawingSectionResourceList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/DrawingSource-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/Envelope-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/FdoLongTransactionList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/FdoProviderCapabilities-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/FdoSpatialContextList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/FeatureProviderRegistry-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/FeatureSet-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/FeatureSource-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/Group-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/GroupList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/LayerDefinition-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/LayerDefinition-1.1.0.designer.cs
   sandbox/maestro-2.5/Generated/LayerDefinition-1.2.0.designer.cs
   sandbox/maestro-2.5/Generated/LayerDefinition-1.3.0.designer.cs
   sandbox/maestro-2.5/Generated/LoadProcedure-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/LoadProcedure-1.1.0.designer.cs
   sandbox/maestro-2.5/Generated/LoadProcedure-2.2.0.designer.cs
   sandbox/maestro-2.5/Generated/MapDefinition-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/PlatformCommon-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/PrintLayout-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/RepositoryList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/ResourceDataList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/ResourceList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/ResourcePackageManifest-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/ResourceReferenceList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/Role-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/SelectAggregate-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/Server-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/ServerList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/SiteInformation-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/SiteVersion-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/StringCollection-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/SymbolDefinition-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/SymbolDefinition-1.1.0.designer.cs
   sandbox/maestro-2.5/Generated/SymbolLibrary-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/Types-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/UnmanagedDataList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/User-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/UserList-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/WebLayout-1.0.0.designer.cs
   sandbox/maestro-2.5/Generated/WebLayout-1.1.0.designer.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/ResourceEditorService.cs
   sandbox/maestro-2.5/Maestro.Base/Editor/WebLayoutEditor.cs
   sandbox/maestro-2.5/Maestro.Base/Maestro.Base.csproj
   sandbox/maestro-2.5/Maestro.Base/Services/OpenResourceManager.cs
   sandbox/maestro-2.5/Maestro.Base/UI/SiteExplorer.cs
   sandbox/maestro-2.5/Maestro.Editors/Common/ResourceDataCtrl.cs
   sandbox/maestro-2.5/Maestro.Editors/EditorBase.cs
   sandbox/maestro-2.5/Maestro.Editors/IEditorService.cs
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.Designer.cs
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.resx
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs
   sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
   sandbox/maestro-2.5/Maestro.Editors/Maestro.Editors.csproj
   sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/Feature/FeatureSetReader.cs
   sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
   sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
   sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/readme.txt
Log:
This submission marks a shift in the current thinking with regards to the generated resource model classes. Before we had classes generated with field initializers to prevent any NullReferenceException surprises, but it turned out that this interfered with the generation of XML as it resulted in a lot of extraneous empty elements (eg. <ExtendedData1 />) that the MapGuide Server simply refuses to accept.

As a result, we have regenerated the classes with field initialization disabled, though this opens up the potential for unwanted NullReferenceExceptions when accessing properties, we can mitigate that through the following mechanisms:
 - Make all constructors non-public
 - Delegate all creation of any generated class to an ObjectFactory

This way, no NullReferenceExceptions will happen since it will be the ObjectFactory's responsibility to ensure all child properties of any object are properly initialized.

This submission has resulted in the correct generation of XML, and as a result, our partially implemented Layer Definition editor saves without problems.

Other changes include:
 - Add placeholder editors for most 1.0.0 resource types, any resource types greater than 1.0.0 are opened by the generic XML editor


Modified: sandbox/maestro-2.5/Generated/ApplicationDefinition-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/ApplicationDefinition-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/ApplicationDefinition-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -38,15 +38,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ApplicationDefinitionType class constructor
-        /// </summary>
-        public ApplicationDefinitionType() {
-            this.extensionField = new CustomContentType();
-            this.widgetSetField = new BindingList<WidgetSetType>();
-            this.mapSetField = new BindingList<MapGroupType>();
-        }
-        
         public string Title {
             get {
                 return this.titleField;
@@ -311,7 +302,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -332,15 +323,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MapGroupType class constructor
-        /// </summary>
-        public MapGroupType() {
-            this.extensionField = new CustomContentType();
-            this.mapField = new BindingList<MapType>();
-            this.initialViewField = new MapViewType();
-        }
-        
         public MapViewType InitialView {
             get {
                 return this.initialViewField;
@@ -587,7 +569,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -815,7 +797,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UiWidgetType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MapWidgetType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -836,13 +818,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// WidgetType class constructor
-        /// </summary>
-        public WidgetType() {
-            this.extensionField = new CustomContentType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -1087,7 +1062,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1095,19 +1070,12 @@
     public partial class CustomContentType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CustomContentType class constructor
-        /// </summary>
-        public CustomContentType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -1297,7 +1265,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1604,7 +1572,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1809,7 +1777,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(WidgetItemType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SeparatorItemType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(FlyoutItemType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2005,7 +1973,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum UiItemFunctionType {
         
@@ -2019,7 +1987,7 @@
         Flyout,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2221,7 +2189,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2402,7 +2370,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2426,13 +2394,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FlyoutItemType class constructor
-        /// </summary>
-        public FlyoutItemType() {
-            this.itemField = new BindingList<UiItemType>();
-        }
-        
         public string Label {
             get {
                 return this.labelField;
@@ -2697,7 +2658,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UiItemContainerType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2718,13 +2679,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ContainerType class constructor
-        /// </summary>
-        public ContainerType() {
-            this.extensionField = new CustomContentType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -2969,7 +2923,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2981,13 +2935,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// UiItemContainerType class constructor
-        /// </summary>
-        public UiItemContainerType() {
-            this.itemField = new BindingList<UiItemType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Item")]
         public BindingList<UiItemType> Item {
             get {
@@ -3179,7 +3126,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3197,15 +3144,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// WidgetSetType class constructor
-        /// </summary>
-        public WidgetSetType() {
-            this.widgetField = new BindingList<WidgetType>();
-            this.mapWidgetField = new MapWidgetType();
-            this.containerField = new BindingList<ContainerType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Container")]
         public BindingList<ContainerType> Container {
             get {
@@ -3434,7 +3372,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3452,13 +3390,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MapType class constructor
-        /// </summary>
-        public MapType() {
-            this.extensionField = new CustomContentType();
-        }
-        
         public string Type {
             get {
                 return this.typeField;
@@ -3685,7 +3616,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3697,13 +3628,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MapSetType class constructor
-        /// </summary>
-        public MapSetType() {
-            this.mapGroupField = new BindingList<MapGroupType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("MapGroup")]
         public BindingList<MapGroupType> MapGroup {
             get {

Modified: sandbox/maestro-2.5/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Application definition widget info set
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ApplicationDefinitionWidgetInfoSet class constructor
-        /// </summary>
-        public ApplicationDefinitionWidgetInfoSet() {
-            this.widgetInfoField = new BindingList<ApplicationDefinitionWidgetInfoType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("WidgetInfo")]
         public BindingList<ApplicationDefinitionWidgetInfoType> WidgetInfo {
             get {
@@ -228,7 +221,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -276,14 +269,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ApplicationDefinitionWidgetInfoType class constructor
-        /// </summary>
-        public ApplicationDefinitionWidgetInfoType() {
-            this.parameterField = new BindingList<ApplicationDefinitionWidgetParameterType>();
-            this.containableByField = new BindingList<string>();
-        }
-        
         public string Type {
             get {
                 return this.typeField;
@@ -681,7 +666,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -720,13 +705,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ApplicationDefinitionWidgetParameterType class constructor
-        /// </summary>
-        public ApplicationDefinitionWidgetParameterType() {
-            this.allowedValueField = new BindingList<AllowedValueType>();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -1069,7 +1047,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1295,7 +1273,7 @@
     /// <summary>
     /// Application definition container info set
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1308,13 +1286,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ApplicationDefinitionContainerInfoSet class constructor
-        /// </summary>
-        public ApplicationDefinitionContainerInfoSet() {
-            this.containerInfoField = new BindingList<ApplicationDefinitionContainerInfoType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("ContainerInfo")]
         public BindingList<ApplicationDefinitionContainerInfoType> ContainerInfo {
             get {
@@ -1506,7 +1477,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1774,7 +1745,7 @@
     /// <summary>
     /// Application definition template info set
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1787,13 +1758,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ApplicationDefinitionTemplateInfoSet class constructor
-        /// </summary>
-        public ApplicationDefinitionTemplateInfoSet() {
-            this.templateInfoField = new BindingList<ApplicationDefinitionTemplateInfoType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("TemplateInfo")]
         public BindingList<ApplicationDefinitionTemplateInfoType> TemplateInfo {
             get {
@@ -1985,7 +1949,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2009,13 +1973,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ApplicationDefinitionTemplateInfoType class constructor
-        /// </summary>
-        public ApplicationDefinitionTemplateInfoType() {
-            this.panelField = new BindingList<ApplicationDefinitionPanelType>();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -2279,7 +2236,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/BatchPropertyCollection-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/BatchPropertyCollection-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/BatchPropertyCollection-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// PropertyCollection list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -31,13 +31,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// BatchPropertyCollection class constructor
-        /// </summary>
-        public BatchPropertyCollection() {
-            this.propertyCollectionField = new BindingList<BatchPropertyCollectionPropertyCollection>();
-        }
-        
-        /// <summary>
         /// Property list
         /// </summary>
         [System.Xml.Serialization.XmlElementAttribute("PropertyCollection")]
@@ -234,7 +227,7 @@
     /// <summary>
     /// Property list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -246,13 +239,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// BatchPropertyCollectionPropertyCollection class constructor
-        /// </summary>
-        public BatchPropertyCollectionPropertyCollection() {
-            this.propertyField = new BindingList<BatchPropertyCollectionPropertyCollectionProperty>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Property")]
         public BindingList<BatchPropertyCollectionPropertyCollectionProperty> Property {
             get {
@@ -444,7 +430,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/DataStoreList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/DataStoreList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/DataStoreList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// The list of datastores from a EnumerateDataStores request
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -31,13 +31,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// DataStoreList class constructor
-        /// </summary>
-        public DataStoreList() {
-            this.dataStoreField = new BindingList<DataStoreListDataStore>();
-        }
-        
-        /// <summary>
         /// A data store entry.
         /// </summary>
         [System.Xml.Serialization.XmlElementAttribute("DataStore")]
@@ -234,7 +227,7 @@
     /// <summary>
     /// A data store entry.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/DrawingSectionList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/DrawingSectionList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/DrawingSectionList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Drawing Section list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DrawingSectionList class constructor
-        /// </summary>
-        public DrawingSectionList() {
-            this.sectionField = new BindingList<DrawingSectionListSection>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Section")]
         public BindingList<DrawingSectionListSection> Section {
             get {
@@ -228,7 +221,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/DrawingSectionResourceList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/DrawingSectionResourceList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/DrawingSectionResourceList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Drawing Section Resource list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DrawingSectionResourceList class constructor
-        /// </summary>
-        public DrawingSectionResourceList() {
-            this.sectionResourceField = new BindingList<DrawingSectionResourceListSectionResource>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SectionResource")]
         public BindingList<DrawingSectionResourceListSectionResource> SectionResource {
             get {
@@ -228,7 +221,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/DrawingSource-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/DrawingSource-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/DrawingSource-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// A drawing source is a definition that provides part of the information required to connect to a particular drawing
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -37,13 +37,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// DrawingSource class constructor
-        /// </summary>
-        public DrawingSource() {
-            this.sheetField = new BindingList<DrawingSourceSheet>();
-        }
-        
-        /// <summary>
         /// Specifies the source (pathname) of the drawing
         /// </summary>
         public string SourceName {
@@ -276,7 +269,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -291,13 +284,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DrawingSourceSheet class constructor
-        /// </summary>
-        public DrawingSourceSheet() {
-            this.extentField = new DrawingSourceSheetExtent();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -506,7 +492,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/Envelope-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/Envelope-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/Envelope-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Specifies an envelope (a rectangle) using two corner points.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -34,14 +34,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// Envelope class constructor
-        /// </summary>
-        public Envelope() {
-            this.upperRightCoordinateField = new EnvelopeUpperRightCoordinate();
-            this.lowerLeftCoordinateField = new EnvelopeLowerLeftCoordinate();
-        }
-        
-        /// <summary>
         /// Specifies the lower left corner of the envelope.
         /// </summary>
         public EnvelopeLowerLeftCoordinate LowerLeftCoordinate {
@@ -258,7 +250,7 @@
     /// <summary>
     /// Specifies the lower left corner of the envelope.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -526,7 +518,7 @@
     /// <summary>
     /// Specifies the upper right corner of the envelope.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/FdoLongTransactionList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/FdoLongTransactionList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/FdoLongTransactionList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -29,13 +29,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoLongTransactionList class constructor
-        /// </summary>
-        public FdoLongTransactionList() {
-            this.longTransactionField = new BindingList<FdoLongTransactionListLongTransaction>();
-        }
-        
         public string ProviderName {
             get {
                 return this.providerNameField;
@@ -245,7 +238,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/FdoProviderCapabilities-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/FdoProviderCapabilities-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/FdoProviderCapabilities-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Capabilities</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Capabilities</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Capabilities {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -50,21 +50,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilities class constructor
-        /// </summary>
-        public FdoProviderCapabilities() {
-            this.geometryField = new FdoProviderCapabilitiesGeometry();
-            this.topologyField = new FdoProviderCapabilitiesTopology();
-            this.rasterField = new FdoProviderCapabilitiesRaster();
-            this.expressionField = new FdoProviderCapabilitiesExpression();
-            this.filterField = new FdoProviderCapabilitiesFilter();
-            this.commandField = new FdoProviderCapabilitiesCommand();
-            this.schemaField = new FdoProviderCapabilitiesSchema();
-            this.connectionField = new FdoProviderCapabilitiesConnection();
-            this.providerField = new FdoProviderCapabilitiesProvider();
-        }
-        
         public FdoProviderCapabilitiesProvider Provider {
             get {
                 return this.providerField;
@@ -399,7 +384,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -624,7 +609,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -657,13 +642,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilitiesConnection class constructor
-        /// </summary>
-        public FdoProviderCapabilitiesConnection() {
-            this.spatialContextExtentField = new BindingList<FdoProviderCapabilitiesConnectionType>();
-        }
-        
         public FdoProviderCapabilitiesConnectionThreadCapability ThreadCapability {
             get {
                 return this.threadCapabilityField;
@@ -939,7 +917,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesConnectionThreadCapability {
@@ -957,7 +935,7 @@
         MultiThreaded,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesConnectionType {
@@ -969,7 +947,7 @@
         Dynamic,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1002,14 +980,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilitiesSchema class constructor
-        /// </summary>
-        public FdoProviderCapabilitiesSchema() {
-            this.dataField = new BindingList<FdoProviderCapabilitiesSchemaType1>();
-            this.classField = new BindingList<FdoProviderCapabilitiesSchemaType>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("Type", IsNullable=false)]
         public BindingList<FdoProviderCapabilitiesSchemaType> Class {
             get {
@@ -1292,7 +1262,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesSchemaType {
@@ -1304,7 +1274,7 @@
         FeatureClass,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesSchemaType1 {
@@ -1349,7 +1319,7 @@
         UniqueID,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1367,13 +1337,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilitiesCommand class constructor
-        /// </summary>
-        public FdoProviderCapabilitiesCommand() {
-            this.supportedCommandsField = new BindingList<FdoProviderCapabilitiesCommandName>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("Name", IsNullable=false)]
         public BindingList<FdoProviderCapabilitiesCommandName> SupportedCommands {
             get {
@@ -1589,7 +1552,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesCommandName {
@@ -1703,7 +1666,7 @@
         DeactivateLongTransaction,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1727,15 +1690,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilitiesFilter class constructor
-        /// </summary>
-        public FdoProviderCapabilitiesFilter() {
-            this.distanceField = new BindingList<FdoProviderCapabilitiesFilterOperation1>();
-            this.spatialField = new BindingList<FdoProviderCapabilitiesFilterOperation>();
-            this.conditionField = new BindingList<FdoProviderCapabilitiesFilterType>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("Type", IsNullable=false)]
         public BindingList<FdoProviderCapabilitiesFilterType> Condition {
             get {
@@ -1989,7 +1943,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesFilterType {
@@ -2013,7 +1967,7 @@
         Distance,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesFilterOperation {
@@ -2052,7 +2006,7 @@
         EnvelopeIntersects,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesFilterOperation1 {
@@ -2064,7 +2018,7 @@
         Within,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2079,14 +2033,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilitiesExpression class constructor
-        /// </summary>
-        public FdoProviderCapabilitiesExpression() {
-            this.functionDefinitionListField = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinition>();
-            this.typeField = new BindingList<FdoProviderCapabilitiesExpressionName>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("Name", IsNullable=false)]
         public BindingList<FdoProviderCapabilitiesExpressionName> Type {
             get {
@@ -2297,7 +2243,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesExpressionName {
@@ -2312,7 +2258,7 @@
         Parameter,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2333,13 +2279,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilitiesExpressionFunctionDefinition class constructor
-        /// </summary>
-        public FdoProviderCapabilitiesExpressionFunctionDefinition() {
-            this.argumentDefinitionListField = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -2579,7 +2518,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesExpressionFunctionDefinitionReturnType {
@@ -2624,7 +2563,7 @@
         UniqueID,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2862,7 +2801,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType {
@@ -2907,7 +2846,7 @@
         UniqueID,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3133,7 +3072,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3389,7 +3328,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3407,14 +3346,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoProviderCapabilitiesGeometry class constructor
-        /// </summary>
-        public FdoProviderCapabilitiesGeometry() {
-            this.componentsField = new BindingList<FdoProviderCapabilitiesGeometryType1>();
-            this.typesField = new BindingList<FdoProviderCapabilitiesGeometryType>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("Type", IsNullable=false)]
         public BindingList<FdoProviderCapabilitiesGeometryType> Types {
             get {
@@ -3644,7 +3575,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesGeometryType {
@@ -3686,7 +3617,7 @@
         MultiCurvePolygon,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoProviderCapabilitiesGeometryType1 {

Modified: sandbox/maestro-2.5/Generated/FdoSpatialContextList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/FdoSpatialContextList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/FdoSpatialContextList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -29,13 +29,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoSpatialContextList class constructor
-        /// </summary>
-        public FdoSpatialContextList() {
-            this.spatialContextField = new BindingList<FdoSpatialContextListSpatialContext>();
-        }
-        
         public string ProviderName {
             get {
                 return this.providerNameField;
@@ -245,7 +238,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -282,7 +275,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public FdoSpatialContextListSpatialContext() {
-            this.extentField = new FdoSpatialContextListSpatialContextExtent();
             this.isActiveField = false;
         }
         
@@ -601,7 +593,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum FdoSpatialContextListSpatialContextExtentType {
@@ -616,7 +608,7 @@
     /// <summary>
     /// This would return AWKT representing extents e.g. polygon, polyline or circle etc.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -631,14 +623,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FdoSpatialContextListSpatialContextExtent class constructor
-        /// </summary>
-        public FdoSpatialContextListSpatialContextExtent() {
-            this.upperRightCoordinateField = new FdoSpatialContextListSpatialContextExtentUpperRightCoordinate();
-            this.lowerLeftCoordinateField = new FdoSpatialContextListSpatialContextExtentLowerLeftCoordinate();
-        }
-        
         public FdoSpatialContextListSpatialContextExtentLowerLeftCoordinate LowerLeftCoordinate {
             get {
                 return this.lowerLeftCoordinateField;
@@ -847,7 +831,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1112,7 +1096,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/FeatureProviderRegistry-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/FeatureProviderRegistry-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/FeatureProviderRegistry-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Root element that contains a collection of FeatureProvider elements.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// FeatureProviderRegistry class constructor
-        /// </summary>
-        public FeatureProviderRegistry() {
-            this.featureProviderField = new BindingList<FeatureProviderRegistryFeatureProvider>();
-        }
-        
-        /// <summary>
         /// Describes an installed feature provider.
         /// </summary>
         [System.Xml.Serialization.XmlElementAttribute("FeatureProvider")]
@@ -233,7 +226,7 @@
     /// <summary>
     /// Describes an installed feature provider.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -261,13 +254,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// FeatureProviderRegistryFeatureProvider class constructor
-        /// </summary>
-        public FeatureProviderRegistryFeatureProvider() {
-            this.connectionPropertiesField = new BindingList<FeatureProviderRegistryFeatureProviderConnectionProperty>();
-        }
-        
-        /// <summary>
         /// Unique name of the feature provider. This name should be of the form <Company>.<Provider>.lt;Version>.
         /// </summary>
         public string Name {
@@ -566,7 +552,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -596,13 +582,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FeatureProviderRegistryFeatureProviderConnectionProperty class constructor
-        /// </summary>
-        public FeatureProviderRegistryFeatureProviderConnectionProperty() {
-            this.valueField = new BindingList<string>();
-        }
-        
         public string Name {
             get {
                 return this.nameField;

Modified: sandbox/maestro-2.5/Generated/FeatureSet-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/FeatureSet-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/FeatureSet-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Specifies a set of features grouped by layers and feature classes.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -31,13 +31,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// FeatureSet class constructor
-        /// </summary>
-        public FeatureSet() {
-            this.layerField = new BindingList<FeatureSetLayer>();
-        }
-        
-        /// <summary>
         /// Specifies the layer containing the features.
         /// </summary>
         [System.Xml.Serialization.XmlElementAttribute("Layer")]
@@ -234,7 +227,7 @@
     /// <summary>
     /// Specifies the layer containing the features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -250,13 +243,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// FeatureSetLayer class constructor
-        /// </summary>
-        public FeatureSetLayer() {
-            this.classField = new BindingList<FeatureSetLayerClass>();
-        }
-        
-        /// <summary>
         /// Specifies the feature class.
         /// </summary>
         [System.Xml.Serialization.XmlElementAttribute("Class")]
@@ -475,7 +461,7 @@
     /// <summary>
     /// Specifies the feature class.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -491,13 +477,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// FeatureSetLayerClass class constructor
-        /// </summary>
-        public FeatureSetLayerClass() {
-            this.idField = new BindingList<string>();
-        }
-        
-        /// <summary>
         /// An ID associated with a feature.  This ID should be unique in the context of the layer and feature class.
         /// </summary>
         [System.Xml.Serialization.XmlElementAttribute("ID")]

Modified: sandbox/maestro-2.5/Generated/FeatureSource-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/FeatureSource-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/FeatureSource-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.FeatureSource</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.FeatureSource</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.FeatureSource {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -47,16 +47,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FeatureSourceType class constructor
-        /// </summary>
-        public FeatureSourceType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.extensionField = new BindingList<FeatureSourceTypeExtension>();
-            this.supplementalSpatialContextInfoField = new BindingList<SpatialContextType>();
-            this.parameterField = new BindingList<NameValuePairType>();
-        }
-        
         public string Provider {
             get {
                 return this.providerField;
@@ -167,8 +157,7 @@
                 }
             }
         }
-
-        [XmlIgnore] //HACK: Disable and only worry about it if the schema is revved
+        
         public ExtendedDataType ExtendedData1 {
             get {
                 return this.extendedData1Field;
@@ -378,7 +367,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -396,13 +385,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// NameValuePairType class constructor
-        /// </summary>
-        public NameValuePairType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -438,8 +420,7 @@
                 }
             }
         }
-
-        [XmlIgnore] //HACK: Disable and only worry about it if the schema is revved
+        
         public ExtendedDataType ExtendedData1 {
             get {
                 return this.extendedData1Field;
@@ -630,26 +611,19 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -839,7 +813,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -857,13 +831,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RelatePropertyType class constructor
-        /// </summary>
-        public RelatePropertyType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FeatureClassProperty {
             get {
                 return this.featureClassPropertyField;
@@ -899,8 +866,7 @@
                 }
             }
         }
-
-        [XmlIgnore] //HACK: Disable and only worry about it if the schema is revved
+        
         public ExtendedDataType ExtendedData1 {
             get {
                 return this.extendedData1Field;
@@ -1091,7 +1057,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1130,14 +1096,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AttributeRelateType class constructor
-        /// </summary>
-        public AttributeRelateType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.relatePropertyField = new BindingList<RelatePropertyType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("RelateProperty")]
         public BindingList<RelatePropertyType> RelateProperty {
             get {
@@ -1279,7 +1237,6 @@
             }
         }
         
-        [XmlIgnore] //HACK: Disable and only worry about it if the schema is revved
         public ExtendedDataType ExtendedData1 {
             get {
                 return this.extendedData1Field;
@@ -1470,7 +1427,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum RelateTypeEnum {
         
@@ -1487,7 +1444,7 @@
         Association,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1505,13 +1462,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CalculatedPropertyType class constructor
-        /// </summary>
-        public CalculatedPropertyType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -1547,8 +1497,7 @@
                 }
             }
         }
-
-        [XmlIgnore] //HACK: Disable and only worry about it if the schema is revved
+        
         public ExtendedDataType ExtendedData1 {
             get {
                 return this.extendedData1Field;
@@ -1739,7 +1688,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1757,13 +1706,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// SpatialContextType class constructor
-        /// </summary>
-        public SpatialContextType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -1799,8 +1741,7 @@
                 }
             }
         }
-
-        [XmlIgnore] //HACK: Disable and only worry about it if the schema is revved
+        
         public ExtendedDataType ExtendedData1 {
             get {
                 return this.extendedData1Field;
@@ -1991,7 +1932,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2015,15 +1956,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FeatureSourceTypeExtension class constructor
-        /// </summary>
-        public FeatureSourceTypeExtension() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.attributeRelateField = new BindingList<AttributeRelateType>();
-            this.calculatedPropertyField = new BindingList<CalculatedPropertyType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("CalculatedProperty")]
         public BindingList<CalculatedPropertyType> CalculatedProperty {
             get {
@@ -2097,8 +2029,7 @@
                 }
             }
         }
-
-        [XmlIgnore] //HACK: Disable and only worry about it if the schema is revved
+        
         public ExtendedDataType ExtendedData1 {
             get {
                 return this.extendedData1Field;

Modified: sandbox/maestro-2.5/Generated/Group-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/Group-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/Group-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Group
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -33,13 +33,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// Group class constructor
-        /// </summary>
-        public Group() {
-            this.usersField = new GroupUsers();
-        }
-        
         public string Description {
             get {
                 return this.descriptionField;
@@ -248,7 +241,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -260,13 +253,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GroupUsers class constructor
-        /// </summary>
-        public GroupUsers() {
-            this.userField = new BindingList<GroupUsersUser>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("User")]
         public BindingList<GroupUsersUser> User {
             get {
@@ -458,7 +444,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/GroupList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/GroupList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/GroupList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Group list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GroupList class constructor
-        /// </summary>
-        public GroupList() {
-            this.groupField = new BindingList<GroupListGroup>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Group")]
         public BindingList<GroupListGroup> Group {
             get {
@@ -228,7 +221,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/LayerDefinition-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/LayerDefinition-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/LayerDefinition-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition {
@@ -17,7 +17,7 @@
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -221,7 +221,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -233,13 +233,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LayerDefinitionType class constructor
-        /// </summary>
-        public LayerDefinitionType() {
-            this.itemField = new BaseLayerDefinitionType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("DrawingLayerDefinition", typeof(DrawingLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("GridLayerDefinition", typeof(GridLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("VectorLayerDefinition", typeof(VectorLayerDefinitionType))]
@@ -433,7 +426,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -461,7 +454,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public DrawingLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.minScaleField = 0;
         }
         
@@ -729,26 +721,19 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -938,7 +923,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -969,9 +954,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorStyleField = new GridColorStyleType();
-            this.surfaceStyleField = new GridSurfaceStyleType();
             this.minScaleField = 0;
         }
         
@@ -1251,7 +1233,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1276,7 +1258,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridSurfaceStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.zeroValueField = 0;
             this.scaleFactorField = 1;
         }
@@ -1533,7 +1514,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1561,9 +1542,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridColorStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorRuleField = new BindingList<GridColorRuleType>();
-            this.hillShadeField = new HillShadeType();
             this.brightnessFactorField = 0;
             this.contrastFactorField = 0;
         }
@@ -1839,7 +1817,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1864,7 +1842,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public HillShadeType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.scaleFactorField = 1;
         }
         
@@ -2113,7 +2090,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2137,15 +2114,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorRuleType class constructor
-        /// </summary>
-        public GridColorRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorField = new GridColorType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -2408,7 +2376,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2454,8 +2422,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.advancedPlacementField = new TextSymbolTypeAdvancedPlacement();
             this.horizontalAlignmentField = "\'Center\'";
             this.verticalAlignmentField = "\'Baseline\'";
             this.boldField = "false";
@@ -2850,7 +2816,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum BackgroundStyleType {
         
@@ -2864,7 +2830,7 @@
         Ghosted,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3082,7 +3048,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ImageSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MarkSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TextSymbolType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3418,7 +3384,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum LengthUnitType {
         
@@ -3450,7 +3416,7 @@
         Points,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum SizeContextType {
         
@@ -3461,7 +3427,7 @@
         DeviceUnits,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3485,13 +3451,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// BlockSymbolType class constructor
-        /// </summary>
-        public BlockSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string DrawingName {
             get {
                 return this.drawingNameField;
@@ -3754,7 +3713,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3778,14 +3737,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// W2DSymbolType class constructor
-        /// </summary>
-        public W2DSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.w2DSymbolField = new W2DSymbolTypeW2DSymbol();
-        }
-        
         public W2DSymbolTypeW2DSymbol W2DSymbol {
             get {
                 return this.w2DSymbolField;
@@ -4048,7 +3999,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4271,7 +4222,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4310,13 +4261,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FontSymbolType class constructor
-        /// </summary>
-        public FontSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FontName {
             get {
                 return this.fontNameField;
@@ -4636,7 +4580,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4651,13 +4595,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ImageSymbolType class constructor
-        /// </summary>
-        public ImageSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Content", typeof(byte[]), DataType="hexBinary")]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolTypeImage))]
         public object Item {
@@ -4868,7 +4805,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5091,7 +5028,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5112,15 +5049,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MarkSymbolType class constructor
-        /// </summary>
-        public MarkSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.edgeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public ShapeType Shape {
             get {
                 return this.shapeField;
@@ -5359,7 +5287,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ShapeType {
         
@@ -5382,7 +5310,7 @@
         X,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5403,13 +5331,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FillType class constructor
-        /// </summary>
-        public FillType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FillPattern {
             get {
                 return this.fillPatternField;
@@ -5654,7 +5575,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5678,13 +5599,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// StrokeType class constructor
-        /// </summary>
-        public StrokeType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string LineStyle {
             get {
                 return this.lineStyleField;
@@ -5941,7 +5855,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5959,13 +5873,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorType class constructor
-        /// </summary>
-        public GridColorType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Band", typeof(string))]
         [System.Xml.Serialization.XmlElementAttribute("Bands", typeof(GridColorBandsType))]
         [System.Xml.Serialization.XmlElementAttribute("ExplicitColor", typeof(string))]
@@ -6191,7 +6098,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6209,15 +6116,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorBandsType class constructor
-        /// </summary>
-        public GridColorBandsType() {
-            this.blueBandField = new ChannelBandType();
-            this.greenBandField = new ChannelBandType();
-            this.redBandField = new ChannelBandType();
-        }
-        
         public ChannelBandType RedBand {
             get {
                 return this.redBandField;
@@ -6444,7 +6342,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6478,7 +6376,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ChannelBandType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lowChannelField = ((byte)(0));
             this.highChannelField = ((byte)(255));
         }
@@ -6779,7 +6676,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
     public enum ItemChoiceType {
@@ -6795,7 +6692,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(AreaSymbolizationFillType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6976,7 +6873,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6994,15 +6891,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaSymbolizationFillType class constructor
-        /// </summary>
-        public AreaSymbolizationFillType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.strokeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public FillType Fill {
             get {
                 return this.fillField;
@@ -7229,7 +7117,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7253,15 +7141,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LineRuleType class constructor
-        /// </summary>
-        public LineRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemsField = new BindingList<StrokeType>();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -7525,7 +7404,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7540,14 +7419,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LineTypeStyleType class constructor
-        /// </summary>
-        public LineTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.lineRuleField = new BindingList<LineRuleType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("LineRule")]
         public BindingList<LineRuleType> LineRule {
             get {
@@ -7757,7 +7628,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7938,7 +7809,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7953,14 +7824,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointSymbolization2DType class constructor
-        /// </summary>
-        public PointSymbolization2DType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new SymbolType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Block", typeof(BlockSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Font", typeof(FontSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolType))]
@@ -8174,7 +8037,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8198,15 +8061,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointRuleType class constructor
-        /// </summary>
-        public PointRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new PointSymbolization2DType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -8470,7 +8324,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8491,14 +8345,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointTypeStyleType class constructor
-        /// </summary>
-        public PointTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.pointRuleField = new BindingList<PointRuleType>();
-        }
-        
         public bool DisplayAsText {
             get {
                 return this.displayAsTextField;
@@ -8732,7 +8578,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8756,15 +8602,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaRuleType class constructor
-        /// </summary>
-        public AreaRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new AreaSymbolizationFillType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -9028,7 +8865,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9043,14 +8880,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaTypeStyleType class constructor
-        /// </summary>
-        public AreaTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.areaRuleField = new BindingList<AreaRuleType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("AreaRule")]
         public BindingList<AreaRuleType> AreaRule {
             get {
@@ -9260,7 +9089,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9285,8 +9114,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public VectorScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemsField = new BindingList<object>();
             this.minScaleField = 0;
         }
         
@@ -9539,7 +9366,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9557,13 +9384,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// NameStringPairType class constructor
-        /// </summary>
-        public NameStringPairType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -9793,7 +9613,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(GridLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(VectorLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DrawingLayerDefinitionType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10015,7 +9835,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10039,14 +9859,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridLayerDefinitionType class constructor
-        /// </summary>
-        public GridLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.gridScaleRangeField = new BindingList<GridScaleRangeType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -10310,7 +10122,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10346,15 +10158,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// VectorLayerDefinitionType class constructor
-        /// </summary>
-        public VectorLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.vectorScaleRangeField = new BindingList<VectorScaleRangeType>();
-            this.propertyMappingField = new BindingList<NameStringPairType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -10685,7 +10488,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum FeatureNameType {
         

Modified: sandbox/maestro-2.5/Generated/LayerDefinition-1.1.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/LayerDefinition-1.1.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/LayerDefinition-1.1.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -225,7 +225,7 @@
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -255,19 +255,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// SimpleSymbolDefinition class constructor
-        /// </summary>
-        public SimpleSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterDefinitionField = new ParameterDefinition();
-            this.areaUsageField = new AreaUsage();
-            this.lineUsageField = new LineUsage();
-            this.pointUsageField = new PointUsage();
-            this.resizeBoxField = new ResizeBox();
-            this.graphicsField = new BindingList<GraphicBase>();
-        }
-        
-        /// <summary>
         /// The collection of graphic elements defining this symbol.
         /// </summary>
         [System.Xml.Serialization.XmlArrayItemAttribute(typeof(Image), IsNullable=false)]
@@ -586,7 +573,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -619,7 +606,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Image() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.sizeScalableField = "true";
@@ -950,7 +936,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1172,7 +1158,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1190,7 +1176,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SimpleSymbol() {
-            this.extendedData1Field = new ExtendedDataType();
             this.renderingPassField = "0";
         }
         
@@ -1426,26 +1411,19 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -1635,7 +1613,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1662,7 +1640,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Parameter() {
-            this.extendedData1Field = new ExtendedDataType();
             this.dataTypeField = DataType.String;
         }
         
@@ -1956,7 +1933,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum DataType {
         
@@ -1979,7 +1956,7 @@
     /// <summary>
     /// The list of parameters used in this symbol.  If a parameter is not listed here this is considered a bug in the symbol definition.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1993,14 +1970,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterDefinition class constructor
-        /// </summary>
-        public ParameterDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterField = new BindingList<Parameter>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Parameter")]
         public BindingList<Parameter> Parameter {
             get {
@@ -2213,7 +2182,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of area features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2252,7 +2221,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public AreaUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.originControlField = "\'Global\'";
             this.clippingControlField = "\'Clip\'";
@@ -2655,7 +2623,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of linear features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2700,8 +2668,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public LineUsage() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.defaultPathField = new Path();
             this.angleControlField = "\'FromGeometry\'";
             this.unitsControlField = "\'Absolute\'";
             this.vertexControlField = "\'OverlapNone\'";
@@ -3145,7 +3111,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3181,7 +3147,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Path() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lineWeightField = "0.0";
             this.lineWeightScalableField = "true";
             this.lineCapField = "\'Round\'";
@@ -3531,7 +3496,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Text))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Image))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Path))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3737,7 +3702,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3800,8 +3765,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Text() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.frameField = new TextFrame();
             this.fontNameField = "\'Arial\'";
             this.boldField = "false";
             this.italicField = "false";
@@ -4327,7 +4290,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4351,7 +4314,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextFrame() {
-            this.extendedData1Field = new ExtendedDataType();
             this.offsetXField = "0.0";
             this.offsetYField = "0.0";
         }
@@ -4623,7 +4585,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of point features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4647,7 +4609,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public PointUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.angleField = "0.0";
             this.originOffsetXField = "0.0";
@@ -4935,7 +4896,7 @@
     /// <summary>
     /// The optional box used to resize and reposition select graphic elements.  The graphical extent of all elements with ResizeControl set to AddToResizeBox will be added to this box, potentially causing it to grow in size.  Any change in size causes all elements with ResizeControl set to AdjustToResizeBox to be proportionally resized and repositioned.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4962,7 +4923,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ResizeBox() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.positionXField = "0.0";
@@ -5267,7 +5227,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(CompoundSymbolDefinition))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SimpleSymbolDefinition))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5492,7 +5452,7 @@
     /// <summary>
     /// A 2D compound symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5506,14 +5466,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompoundSymbolDefinition class constructor
-        /// </summary>
-        public CompoundSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.simpleSymbolField = new BindingList<SimpleSymbol>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SimpleSymbol")]
         public BindingList<SimpleSymbol> SimpleSymbol {
             get {
@@ -5723,7 +5675,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5934,7 +5886,7 @@
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6142,7 +6094,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6154,13 +6106,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LayerDefinitionType class constructor
-        /// </summary>
-        public LayerDefinitionType() {
-            this.itemField = new BaseLayerDefinitionType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("DrawingLayerDefinition", typeof(DrawingLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("GridLayerDefinition", typeof(GridLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("VectorLayerDefinition", typeof(VectorLayerDefinitionType))]
@@ -6354,7 +6299,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6382,7 +6327,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public DrawingLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.minScaleField = 0;
         }
         
@@ -6653,7 +6597,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(GridLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(VectorLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DrawingLayerDefinitionType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6875,7 +6819,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6899,14 +6843,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridLayerDefinitionType class constructor
-        /// </summary>
-        public GridLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.gridScaleRangeField = new BindingList<GridScaleRangeType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -7170,7 +7106,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7201,9 +7137,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorStyleField = new GridColorStyleType();
-            this.surfaceStyleField = new GridSurfaceStyleType();
             this.minScaleField = 0;
         }
         
@@ -7483,7 +7416,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7508,7 +7441,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridSurfaceStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.zeroValueField = 0;
             this.scaleFactorField = 1;
         }
@@ -7765,7 +7697,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7793,9 +7725,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridColorStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorRuleField = new BindingList<GridColorRuleType>();
-            this.hillShadeField = new HillShadeType();
             this.brightnessFactorField = 0;
             this.contrastFactorField = 0;
         }
@@ -8071,7 +8000,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8096,7 +8025,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public HillShadeType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.scaleFactorField = 1;
         }
         
@@ -8345,7 +8273,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8369,15 +8297,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorRuleType class constructor
-        /// </summary>
-        public GridColorRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorField = new GridColorType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -8640,7 +8559,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8686,8 +8605,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.advancedPlacementField = new TextSymbolTypeAdvancedPlacement();
             this.horizontalAlignmentField = "\'Center\'";
             this.verticalAlignmentField = "\'Baseline\'";
             this.boldField = "false";
@@ -9082,7 +8999,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum BackgroundStyleType {
         
@@ -9096,7 +9013,7 @@
         Ghosted,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9314,7 +9231,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ImageSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MarkSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TextSymbolType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9650,7 +9567,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum LengthUnitType {
         
@@ -9682,7 +9599,7 @@
         Points,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum SizeContextType {
         
@@ -9693,7 +9610,7 @@
         DeviceUnits,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9717,13 +9634,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// BlockSymbolType class constructor
-        /// </summary>
-        public BlockSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string DrawingName {
             get {
                 return this.drawingNameField;
@@ -9986,7 +9896,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10010,14 +9920,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// W2DSymbolType class constructor
-        /// </summary>
-        public W2DSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.w2DSymbolField = new W2DSymbolTypeW2DSymbol();
-        }
-        
         public W2DSymbolTypeW2DSymbol W2DSymbol {
             get {
                 return this.w2DSymbolField;
@@ -10280,7 +10182,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10503,7 +10405,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10542,13 +10444,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FontSymbolType class constructor
-        /// </summary>
-        public FontSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FontName {
             get {
                 return this.fontNameField;
@@ -10868,7 +10763,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10883,13 +10778,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ImageSymbolType class constructor
-        /// </summary>
-        public ImageSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Content", typeof(byte[]), DataType="hexBinary")]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolTypeImage))]
         public object Item {
@@ -11100,7 +10988,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11323,7 +11211,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11344,15 +11232,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MarkSymbolType class constructor
-        /// </summary>
-        public MarkSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.edgeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public ShapeType Shape {
             get {
                 return this.shapeField;
@@ -11591,7 +11470,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ShapeType {
         
@@ -11614,7 +11493,7 @@
         X,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11635,13 +11514,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FillType class constructor
-        /// </summary>
-        public FillType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FillPattern {
             get {
                 return this.fillPatternField;
@@ -11886,7 +11758,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11913,13 +11785,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// StrokeType class constructor
-        /// </summary>
-        public StrokeType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string LineStyle {
             get {
                 return this.lineStyleField;
@@ -12188,7 +12053,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12206,13 +12071,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorType class constructor
-        /// </summary>
-        public GridColorType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Band", typeof(string))]
         [System.Xml.Serialization.XmlElementAttribute("Bands", typeof(GridColorBandsType))]
         [System.Xml.Serialization.XmlElementAttribute("ExplicitColor", typeof(string))]
@@ -12438,7 +12296,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12456,15 +12314,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorBandsType class constructor
-        /// </summary>
-        public GridColorBandsType() {
-            this.blueBandField = new ChannelBandType();
-            this.greenBandField = new ChannelBandType();
-            this.redBandField = new ChannelBandType();
-        }
-        
         public ChannelBandType RedBand {
             get {
                 return this.redBandField;
@@ -12691,7 +12540,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12725,7 +12574,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ChannelBandType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lowChannelField = ((byte)(0));
             this.highChannelField = ((byte)(255));
         }
@@ -13026,7 +12874,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
     public enum ItemChoiceType {
@@ -13041,7 +12889,7 @@
         ExplicitColor,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13077,15 +12925,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// VectorLayerDefinitionType class constructor
-        /// </summary>
-        public VectorLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.vectorScaleRangeField = new BindingList<VectorScaleRangeType>();
-            this.propertyMappingField = new BindingList<NameStringPairType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -13416,7 +13255,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum FeatureNameType {
         
@@ -13427,7 +13266,7 @@
         NamedExtension,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13445,13 +13284,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// NameStringPairType class constructor
-        /// </summary>
-        public NameStringPairType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -13678,7 +13510,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13706,9 +13538,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public VectorScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.elevationSettingsField = new ElevationSettingsType();
-            this.itemsField = new BindingList<object>();
             this.minScaleField = 0;
         }
         
@@ -13980,7 +13809,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13995,14 +13824,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaTypeStyleType class constructor
-        /// </summary>
-        public AreaTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.areaRuleField = new BindingList<AreaRuleType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("AreaRule")]
         public BindingList<AreaRuleType> AreaRule {
             get {
@@ -14212,7 +14033,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14236,15 +14057,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaRuleType class constructor
-        /// </summary>
-        public AreaRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new AreaSymbolizationFillType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -14508,7 +14320,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14526,15 +14338,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaSymbolizationFillType class constructor
-        /// </summary>
-        public AreaSymbolizationFillType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.strokeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public FillType Fill {
             get {
                 return this.fillField;
@@ -14762,7 +14565,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(AreaSymbolizationFillType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14943,7 +14746,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14958,14 +14761,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeTypeStyle class constructor
-        /// </summary>
-        public CompositeTypeStyle() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.compositeRuleField = new BindingList<CompositeRule>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("CompositeRule")]
         public BindingList<CompositeRule> CompositeRule {
             get {
@@ -15175,7 +14970,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15196,14 +14991,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeRule class constructor
-        /// </summary>
-        public CompositeRule() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.compositeSymbolizationField = new CompositeSymbolization();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -15448,7 +15235,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15463,14 +15250,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeSymbolization class constructor
-        /// </summary>
-        public CompositeSymbolization() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.symbolInstanceField = new BindingList<SymbolInstance>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SymbolInstance")]
         public BindingList<SymbolInstance> SymbolInstance {
             get {
@@ -15680,7 +15459,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15726,8 +15505,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SymbolInstance() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterOverridesField = new ParameterOverrides();
             this.scaleXField = "1.0";
             this.scaleYField = "1.0";
             this.insertionOffsetXField = "0.0";
@@ -16131,7 +15908,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16146,14 +15923,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterOverrides class constructor
-        /// </summary>
-        public ParameterOverrides() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.overrideField = new BindingList<Override>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Override")]
         public BindingList<Override> Override {
             get {
@@ -16363,7 +16132,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16384,13 +16153,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// Override class constructor
-        /// </summary>
-        public Override() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string SymbolName {
             get {
                 return this.symbolNameField;
@@ -16635,7 +16397,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16650,14 +16412,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LineTypeStyleType class constructor
-        /// </summary>
-        public LineTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.lineRuleField = new BindingList<LineRuleType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("LineRule")]
         public BindingList<LineRuleType> LineRule {
             get {
@@ -16867,7 +16621,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16891,15 +16645,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LineRuleType class constructor
-        /// </summary>
-        public LineRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemsField = new BindingList<StrokeType>();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -17163,7 +16908,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17184,14 +16929,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointTypeStyleType class constructor
-        /// </summary>
-        public PointTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.pointRuleField = new BindingList<PointRuleType>();
-        }
-        
         public bool DisplayAsText {
             get {
                 return this.displayAsTextField;
@@ -17425,7 +17162,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17449,15 +17186,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointRuleType class constructor
-        /// </summary>
-        public PointRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new PointSymbolization2DType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -17721,7 +17449,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17736,14 +17464,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointSymbolization2DType class constructor
-        /// </summary>
-        public PointSymbolization2DType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new SymbolType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Block", typeof(BlockSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Font", typeof(FontSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolType))]
@@ -17957,7 +17677,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17982,7 +17702,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ElevationSettingsType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.zOffsetTypeField = ElevationTypeType.RelativeToGround;
             this.unitField = LengthUnitType.Centimeters;
         }
@@ -18239,7 +17958,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ElevationTypeType {
         
@@ -18250,7 +17969,7 @@
         Absolute,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/LayerDefinition-1.2.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/LayerDefinition-1.2.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/LayerDefinition-1.2.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -225,7 +225,7 @@
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -255,19 +255,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// SimpleSymbolDefinition class constructor
-        /// </summary>
-        public SimpleSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterDefinitionField = new ParameterDefinition();
-            this.areaUsageField = new AreaUsage();
-            this.lineUsageField = new LineUsage();
-            this.pointUsageField = new PointUsage();
-            this.resizeBoxField = new ResizeBox();
-            this.graphicsField = new BindingList<GraphicBase>();
-        }
-        
-        /// <summary>
         /// The collection of graphic elements defining this symbol.
         /// </summary>
         [System.Xml.Serialization.XmlArrayItemAttribute(typeof(Image), IsNullable=false)]
@@ -586,7 +573,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -619,7 +606,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Image() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.sizeScalableField = "true";
@@ -950,7 +936,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1172,7 +1158,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1190,7 +1176,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SimpleSymbol() {
-            this.extendedData1Field = new ExtendedDataType();
             this.renderingPassField = "0";
         }
         
@@ -1426,26 +1411,19 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -1635,7 +1613,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1662,7 +1640,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Parameter() {
-            this.extendedData1Field = new ExtendedDataType();
             this.dataTypeField = DataType.String;
         }
         
@@ -1956,7 +1933,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum DataType {
         
@@ -2057,7 +2034,7 @@
     /// <summary>
     /// The list of parameters used in this symbol.  If a parameter is not listed here this is considered a bug in the symbol definition.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2071,14 +2048,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterDefinition class constructor
-        /// </summary>
-        public ParameterDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterField = new BindingList<Parameter>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Parameter")]
         public BindingList<Parameter> Parameter {
             get {
@@ -2291,7 +2260,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of area features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2330,7 +2299,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public AreaUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.originControlField = "\'Global\'";
             this.clippingControlField = "\'Clip\'";
@@ -2733,7 +2701,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of linear features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2778,8 +2746,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public LineUsage() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.defaultPathField = new Path();
             this.angleControlField = "\'FromGeometry\'";
             this.unitsControlField = "\'Absolute\'";
             this.vertexControlField = "\'OverlapWrap\'";
@@ -3219,7 +3185,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3255,7 +3221,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Path() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lineWeightField = "0.0";
             this.lineWeightScalableField = "true";
             this.lineCapField = "\'Round\'";
@@ -3605,7 +3570,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Text))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Image))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Path))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3811,7 +3776,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3886,8 +3851,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Text() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.frameField = new TextFrame();
             this.fontNameField = "\'Arial\'";
             this.boldField = "false";
             this.italicField = "false";
@@ -4493,7 +4456,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4517,7 +4480,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextFrame() {
-            this.extendedData1Field = new ExtendedDataType();
             this.offsetXField = "0.0";
             this.offsetYField = "0.0";
         }
@@ -4789,7 +4751,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of point features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4813,7 +4775,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public PointUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.angleField = "0.0";
             this.originOffsetXField = "0.0";
@@ -5101,7 +5062,7 @@
     /// <summary>
     /// The optional box used to resize and reposition select graphic elements.  The graphical extent of all elements with ResizeControl set to AddToResizeBox will be added to this box, potentially causing it to grow in size.  Any change in size causes all elements with ResizeControl set to AdjustToResizeBox to be proportionally resized and repositioned.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5128,7 +5089,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ResizeBox() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.positionXField = "0.0";
@@ -5433,7 +5393,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(CompoundSymbolDefinition))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SimpleSymbolDefinition))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5658,7 +5618,7 @@
     /// <summary>
     /// A 2D compound symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5672,14 +5632,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompoundSymbolDefinition class constructor
-        /// </summary>
-        public CompoundSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.simpleSymbolField = new BindingList<SimpleSymbol>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SimpleSymbol")]
         public BindingList<SimpleSymbol> SimpleSymbol {
             get {
@@ -5889,7 +5841,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6100,7 +6052,7 @@
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6308,7 +6260,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6320,13 +6272,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LayerDefinitionType class constructor
-        /// </summary>
-        public LayerDefinitionType() {
-            this.itemField = new BaseLayerDefinitionType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("DrawingLayerDefinition", typeof(DrawingLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("GridLayerDefinition", typeof(GridLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("VectorLayerDefinition", typeof(VectorLayerDefinitionType))]
@@ -6520,7 +6465,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6548,7 +6493,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public DrawingLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.minScaleField = 0;
         }
         
@@ -6819,7 +6763,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(GridLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(VectorLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DrawingLayerDefinitionType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7041,7 +6985,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7065,14 +7009,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridLayerDefinitionType class constructor
-        /// </summary>
-        public GridLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.gridScaleRangeField = new BindingList<GridScaleRangeType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -7336,7 +7272,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7367,9 +7303,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorStyleField = new GridColorStyleType();
-            this.surfaceStyleField = new GridSurfaceStyleType();
             this.minScaleField = 0;
         }
         
@@ -7649,7 +7582,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7674,7 +7607,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridSurfaceStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.zeroValueField = 0;
             this.scaleFactorField = 1;
         }
@@ -7931,7 +7863,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7959,9 +7891,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridColorStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorRuleField = new BindingList<GridColorRuleType>();
-            this.hillShadeField = new HillShadeType();
             this.brightnessFactorField = 0;
             this.contrastFactorField = 0;
         }
@@ -8237,7 +8166,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8262,7 +8191,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public HillShadeType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.scaleFactorField = 1;
         }
         
@@ -8511,7 +8439,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8535,15 +8463,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorRuleType class constructor
-        /// </summary>
-        public GridColorRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorField = new GridColorType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -8806,7 +8725,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8852,8 +8771,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.advancedPlacementField = new TextSymbolTypeAdvancedPlacement();
             this.horizontalAlignmentField = "\'Center\'";
             this.verticalAlignmentField = "\'Baseline\'";
             this.boldField = "false";
@@ -9248,7 +9165,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum BackgroundStyleType {
         
@@ -9262,7 +9179,7 @@
         Ghosted,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9480,7 +9397,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ImageSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MarkSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TextSymbolType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9816,7 +9733,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum LengthUnitType {
         
@@ -9848,7 +9765,7 @@
         Points,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum SizeContextType {
         
@@ -9859,7 +9776,7 @@
         DeviceUnits,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9883,13 +9800,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// BlockSymbolType class constructor
-        /// </summary>
-        public BlockSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string DrawingName {
             get {
                 return this.drawingNameField;
@@ -10152,7 +10062,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10176,14 +10086,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// W2DSymbolType class constructor
-        /// </summary>
-        public W2DSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.w2DSymbolField = new W2DSymbolTypeW2DSymbol();
-        }
-        
         public W2DSymbolTypeW2DSymbol W2DSymbol {
             get {
                 return this.w2DSymbolField;
@@ -10446,7 +10348,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10669,7 +10571,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10708,13 +10610,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FontSymbolType class constructor
-        /// </summary>
-        public FontSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FontName {
             get {
                 return this.fontNameField;
@@ -11034,7 +10929,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11049,13 +10944,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ImageSymbolType class constructor
-        /// </summary>
-        public ImageSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Content", typeof(byte[]), DataType="hexBinary")]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolTypeImage))]
         public object Item {
@@ -11266,7 +11154,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11489,7 +11377,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11510,15 +11398,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MarkSymbolType class constructor
-        /// </summary>
-        public MarkSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.edgeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public ShapeType Shape {
             get {
                 return this.shapeField;
@@ -11757,7 +11636,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ShapeType {
         
@@ -11780,7 +11659,7 @@
         X,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11801,13 +11680,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FillType class constructor
-        /// </summary>
-        public FillType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FillPattern {
             get {
                 return this.fillPatternField;
@@ -12052,7 +11924,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12079,13 +11951,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// StrokeType class constructor
-        /// </summary>
-        public StrokeType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string LineStyle {
             get {
                 return this.lineStyleField;
@@ -12354,7 +12219,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12372,13 +12237,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorType class constructor
-        /// </summary>
-        public GridColorType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Band", typeof(string))]
         [System.Xml.Serialization.XmlElementAttribute("Bands", typeof(GridColorBandsType))]
         [System.Xml.Serialization.XmlElementAttribute("ExplicitColor", typeof(string))]
@@ -12604,7 +12462,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12622,15 +12480,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorBandsType class constructor
-        /// </summary>
-        public GridColorBandsType() {
-            this.blueBandField = new ChannelBandType();
-            this.greenBandField = new ChannelBandType();
-            this.redBandField = new ChannelBandType();
-        }
-        
         public ChannelBandType RedBand {
             get {
                 return this.redBandField;
@@ -12857,7 +12706,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12891,7 +12740,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ChannelBandType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lowChannelField = ((byte)(0));
             this.highChannelField = ((byte)(255));
         }
@@ -13192,7 +13040,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
     public enum ItemChoiceType {
@@ -13207,7 +13055,7 @@
         ExplicitColor,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13243,15 +13091,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// VectorLayerDefinitionType class constructor
-        /// </summary>
-        public VectorLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.vectorScaleRangeField = new BindingList<VectorScaleRangeType>();
-            this.propertyMappingField = new BindingList<NameStringPairType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -13582,7 +13421,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum FeatureNameType {
         
@@ -13593,7 +13432,7 @@
         NamedExtension,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13611,13 +13450,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// NameStringPairType class constructor
-        /// </summary>
-        public NameStringPairType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -13844,7 +13676,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13872,9 +13704,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public VectorScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.elevationSettingsField = new ElevationSettingsType();
-            this.itemsField = new BindingList<object>();
             this.minScaleField = 0;
         }
         
@@ -14146,7 +13975,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14161,14 +13990,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaTypeStyleType class constructor
-        /// </summary>
-        public AreaTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.areaRuleField = new BindingList<AreaRuleType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("AreaRule")]
         public BindingList<AreaRuleType> AreaRule {
             get {
@@ -14378,7 +14199,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14402,15 +14223,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaRuleType class constructor
-        /// </summary>
-        public AreaRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new AreaSymbolizationFillType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -14674,7 +14486,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14692,15 +14504,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaSymbolizationFillType class constructor
-        /// </summary>
-        public AreaSymbolizationFillType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.strokeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public FillType Fill {
             get {
                 return this.fillField;
@@ -14928,7 +14731,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(AreaSymbolizationFillType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15109,7 +14912,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15124,14 +14927,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeTypeStyle class constructor
-        /// </summary>
-        public CompositeTypeStyle() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.compositeRuleField = new BindingList<CompositeRule>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("CompositeRule")]
         public BindingList<CompositeRule> CompositeRule {
             get {
@@ -15341,7 +15136,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15362,14 +15157,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeRule class constructor
-        /// </summary>
-        public CompositeRule() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.compositeSymbolizationField = new CompositeSymbolization();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -15614,7 +15401,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15629,14 +15416,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeSymbolization class constructor
-        /// </summary>
-        public CompositeSymbolization() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.symbolInstanceField = new BindingList<SymbolInstance>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SymbolInstance")]
         public BindingList<SymbolInstance> SymbolInstance {
             get {
@@ -15846,7 +15625,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15901,8 +15680,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SymbolInstance() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterOverridesField = new ParameterOverrides();
             this.scaleXField = "1.0";
             this.scaleYField = "1.0";
             this.insertionOffsetXField = "0.0";
@@ -16354,7 +16131,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16369,14 +16146,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterOverrides class constructor
-        /// </summary>
-        public ParameterOverrides() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.overrideField = new BindingList<Override>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Override")]
         public BindingList<Override> Override {
             get {
@@ -16586,7 +16355,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16610,14 +16379,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// Override class constructor
-        /// </summary>
-        public Override() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.themeLabelField = new ThemeLabel();
-        }
-        
         public string SymbolName {
             get {
                 return this.symbolNameField;
@@ -16880,7 +16641,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16898,13 +16659,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ThemeLabel class constructor
-        /// </summary>
-        public ThemeLabel() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Description {
             get {
                 return this.descriptionField;
@@ -17131,7 +16885,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum UsageContextType {
         
@@ -17148,7 +16902,7 @@
         Area,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum GeometryContextType {
         
@@ -17165,7 +16919,7 @@
         Polygon,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17180,14 +16934,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LineTypeStyleType class constructor
-        /// </summary>
-        public LineTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.lineRuleField = new BindingList<LineRuleType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("LineRule")]
         public BindingList<LineRuleType> LineRule {
             get {
@@ -17397,7 +17143,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17421,15 +17167,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LineRuleType class constructor
-        /// </summary>
-        public LineRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemsField = new BindingList<StrokeType>();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -17693,7 +17430,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17714,14 +17451,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointTypeStyleType class constructor
-        /// </summary>
-        public PointTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.pointRuleField = new BindingList<PointRuleType>();
-        }
-        
         public bool DisplayAsText {
             get {
                 return this.displayAsTextField;
@@ -17955,7 +17684,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17979,15 +17708,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointRuleType class constructor
-        /// </summary>
-        public PointRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new PointSymbolization2DType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -18251,7 +17971,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -18266,14 +17986,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointSymbolization2DType class constructor
-        /// </summary>
-        public PointSymbolization2DType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new SymbolType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Block", typeof(BlockSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Font", typeof(FontSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolType))]
@@ -18487,7 +18199,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -18512,7 +18224,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ElevationSettingsType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.zOffsetTypeField = ElevationTypeType.RelativeToGround;
             this.unitField = LengthUnitType.Centimeters;
         }
@@ -18769,7 +18480,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ElevationTypeType {
         
@@ -18780,7 +18491,7 @@
         Absolute,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/LayerDefinition-1.3.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/LayerDefinition-1.3.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/LayerDefinition-1.3.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -225,7 +225,7 @@
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -255,19 +255,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// SimpleSymbolDefinition class constructor
-        /// </summary>
-        public SimpleSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterDefinitionField = new ParameterDefinition();
-            this.areaUsageField = new AreaUsage();
-            this.lineUsageField = new LineUsage();
-            this.pointUsageField = new PointUsage();
-            this.resizeBoxField = new ResizeBox();
-            this.graphicsField = new BindingList<GraphicBase>();
-        }
-        
-        /// <summary>
         /// The collection of graphic elements defining this symbol.
         /// </summary>
         [System.Xml.Serialization.XmlArrayItemAttribute(typeof(Image), IsNullable=false)]
@@ -586,7 +573,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -619,7 +606,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Image() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.sizeScalableField = "true";
@@ -950,7 +936,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1172,7 +1158,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1190,7 +1176,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SimpleSymbol() {
-            this.extendedData1Field = new ExtendedDataType();
             this.renderingPassField = "0";
         }
         
@@ -1426,26 +1411,19 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -1635,7 +1613,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1662,7 +1640,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Parameter() {
-            this.extendedData1Field = new ExtendedDataType();
             this.dataTypeField = DataType.String;
         }
         
@@ -1956,7 +1933,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum DataType {
         
@@ -2057,7 +2034,7 @@
     /// <summary>
     /// The list of parameters used in this symbol.  If a parameter is not listed here this is considered a bug in the symbol definition.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2071,14 +2048,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterDefinition class constructor
-        /// </summary>
-        public ParameterDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterField = new BindingList<Parameter>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Parameter")]
         public BindingList<Parameter> Parameter {
             get {
@@ -2291,7 +2260,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of area features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2330,7 +2299,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public AreaUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.originControlField = "\'Global\'";
             this.clippingControlField = "\'Clip\'";
@@ -2733,7 +2701,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of linear features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2778,8 +2746,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public LineUsage() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.defaultPathField = new Path();
             this.angleControlField = "\'FromGeometry\'";
             this.unitsControlField = "\'Absolute\'";
             this.vertexControlField = "\'OverlapWrap\'";
@@ -3219,7 +3185,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3255,7 +3221,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Path() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lineWeightField = "0.0";
             this.lineWeightScalableField = "true";
             this.lineCapField = "\'Round\'";
@@ -3605,7 +3570,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Text))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Image))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Path))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3811,7 +3776,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3886,8 +3851,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Text() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.frameField = new TextFrame();
             this.fontNameField = "\'Arial\'";
             this.boldField = "false";
             this.italicField = "false";
@@ -4493,7 +4456,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4517,7 +4480,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextFrame() {
-            this.extendedData1Field = new ExtendedDataType();
             this.offsetXField = "0.0";
             this.offsetYField = "0.0";
         }
@@ -4789,7 +4751,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of point features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4813,7 +4775,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public PointUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.angleField = "0.0";
             this.originOffsetXField = "0.0";
@@ -5101,7 +5062,7 @@
     /// <summary>
     /// The optional box used to resize and reposition select graphic elements.  The graphical extent of all elements with ResizeControl set to AddToResizeBox will be added to this box, potentially causing it to grow in size.  Any change in size causes all elements with ResizeControl set to AdjustToResizeBox to be proportionally resized and repositioned.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5128,7 +5089,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ResizeBox() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.positionXField = "0.0";
@@ -5433,7 +5393,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(CompoundSymbolDefinition))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SimpleSymbolDefinition))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5658,7 +5618,7 @@
     /// <summary>
     /// A 2D compound symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5672,14 +5632,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompoundSymbolDefinition class constructor
-        /// </summary>
-        public CompoundSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.simpleSymbolField = new BindingList<SimpleSymbol>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SimpleSymbol")]
         public BindingList<SimpleSymbol> SimpleSymbol {
             get {
@@ -5889,7 +5841,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6100,7 +6052,7 @@
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6308,7 +6260,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6320,13 +6272,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LayerDefinitionType class constructor
-        /// </summary>
-        public LayerDefinitionType() {
-            this.itemField = new BaseLayerDefinitionType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("DrawingLayerDefinition", typeof(DrawingLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("GridLayerDefinition", typeof(GridLayerDefinitionType))]
         [System.Xml.Serialization.XmlElementAttribute("VectorLayerDefinition", typeof(VectorLayerDefinitionType))]
@@ -6520,7 +6465,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6548,7 +6493,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public DrawingLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.minScaleField = 0;
         }
         
@@ -6819,7 +6763,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(GridLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(VectorLayerDefinitionType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DrawingLayerDefinitionType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7041,7 +6985,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7065,14 +7009,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridLayerDefinitionType class constructor
-        /// </summary>
-        public GridLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.gridScaleRangeField = new BindingList<GridScaleRangeType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -7336,7 +7272,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7367,9 +7303,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorStyleField = new GridColorStyleType();
-            this.surfaceStyleField = new GridSurfaceStyleType();
             this.minScaleField = 0;
         }
         
@@ -7649,7 +7582,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7674,7 +7607,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridSurfaceStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.zeroValueField = 0;
             this.scaleFactorField = 1;
         }
@@ -7931,7 +7863,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7959,9 +7891,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public GridColorStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorRuleField = new BindingList<GridColorRuleType>();
-            this.hillShadeField = new HillShadeType();
             this.brightnessFactorField = 0;
             this.contrastFactorField = 0;
         }
@@ -8237,7 +8166,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8262,7 +8191,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public HillShadeType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.scaleFactorField = 1;
         }
         
@@ -8511,7 +8439,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8535,15 +8463,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorRuleType class constructor
-        /// </summary>
-        public GridColorRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.colorField = new GridColorType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -8806,7 +8725,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8852,8 +8771,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.advancedPlacementField = new TextSymbolTypeAdvancedPlacement();
             this.horizontalAlignmentField = "\'Center\'";
             this.verticalAlignmentField = "\'Baseline\'";
             this.boldField = "false";
@@ -9248,7 +9165,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum BackgroundStyleType {
         
@@ -9262,7 +9179,7 @@
         Ghosted,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9480,7 +9397,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ImageSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MarkSymbolType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TextSymbolType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9816,7 +9733,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum LengthUnitType {
         
@@ -9848,7 +9765,7 @@
         Points,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum SizeContextType {
         
@@ -9859,7 +9776,7 @@
         DeviceUnits,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -9883,13 +9800,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// BlockSymbolType class constructor
-        /// </summary>
-        public BlockSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string DrawingName {
             get {
                 return this.drawingNameField;
@@ -10152,7 +10062,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10176,14 +10086,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// W2DSymbolType class constructor
-        /// </summary>
-        public W2DSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.w2DSymbolField = new W2DSymbolTypeW2DSymbol();
-        }
-        
         public W2DSymbolTypeW2DSymbol W2DSymbol {
             get {
                 return this.w2DSymbolField;
@@ -10446,7 +10348,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10669,7 +10571,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -10708,13 +10610,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FontSymbolType class constructor
-        /// </summary>
-        public FontSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FontName {
             get {
                 return this.fontNameField;
@@ -11034,7 +10929,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11049,13 +10944,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ImageSymbolType class constructor
-        /// </summary>
-        public ImageSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Content", typeof(byte[]), DataType="hexBinary")]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolTypeImage))]
         public object Item {
@@ -11266,7 +11154,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11489,7 +11377,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11510,15 +11398,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MarkSymbolType class constructor
-        /// </summary>
-        public MarkSymbolType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.edgeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public ShapeType Shape {
             get {
                 return this.shapeField;
@@ -11757,7 +11636,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ShapeType {
         
@@ -11780,7 +11659,7 @@
         X,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -11801,13 +11680,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FillType class constructor
-        /// </summary>
-        public FillType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string FillPattern {
             get {
                 return this.fillPatternField;
@@ -12052,7 +11924,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12079,13 +11951,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// StrokeType class constructor
-        /// </summary>
-        public StrokeType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string LineStyle {
             get {
                 return this.lineStyleField;
@@ -12354,7 +12219,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12372,13 +12237,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorType class constructor
-        /// </summary>
-        public GridColorType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Band", typeof(string))]
         [System.Xml.Serialization.XmlElementAttribute("Bands", typeof(GridColorBandsType))]
         [System.Xml.Serialization.XmlElementAttribute("ExplicitColor", typeof(string))]
@@ -12604,7 +12462,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12622,15 +12480,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// GridColorBandsType class constructor
-        /// </summary>
-        public GridColorBandsType() {
-            this.blueBandField = new ChannelBandType();
-            this.greenBandField = new ChannelBandType();
-            this.redBandField = new ChannelBandType();
-        }
-        
         public ChannelBandType RedBand {
             get {
                 return this.redBandField;
@@ -12857,7 +12706,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -12891,7 +12740,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ChannelBandType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lowChannelField = ((byte)(0));
             this.highChannelField = ((byte)(255));
         }
@@ -13192,7 +13040,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
     public enum ItemChoiceType {
@@ -13207,7 +13055,7 @@
         ExplicitColor,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13243,15 +13091,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// VectorLayerDefinitionType class constructor
-        /// </summary>
-        public VectorLayerDefinitionType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.vectorScaleRangeField = new BindingList<VectorScaleRangeType>();
-            this.propertyMappingField = new BindingList<NameStringPairType>();
-        }
-        
         public string FeatureName {
             get {
                 return this.featureNameField;
@@ -13582,7 +13421,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum FeatureNameType {
         
@@ -13593,7 +13432,7 @@
         NamedExtension,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13611,13 +13450,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// NameStringPairType class constructor
-        /// </summary>
-        public NameStringPairType() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -13844,7 +13676,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -13872,9 +13704,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public VectorScaleRangeType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.elevationSettingsField = new ElevationSettingsType();
-            this.itemsField = new BindingList<object>();
             this.minScaleField = 0;
         }
         
@@ -14146,7 +13975,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14165,8 +13994,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public AreaTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.areaRuleField = new BindingList<AreaRuleType>();
             this.showInLegendField = true;
         }
         
@@ -14392,7 +14219,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14416,15 +14243,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaRuleType class constructor
-        /// </summary>
-        public AreaRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new AreaSymbolizationFillType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -14688,7 +14506,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -14706,15 +14524,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// AreaSymbolizationFillType class constructor
-        /// </summary>
-        public AreaSymbolizationFillType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.strokeField = new StrokeType();
-            this.fillField = new FillType();
-        }
-        
         public FillType Fill {
             get {
                 return this.fillField;
@@ -14942,7 +14751,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(AreaSymbolizationFillType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15123,7 +14932,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15142,8 +14951,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public CompositeTypeStyle() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.compositeRuleField = new BindingList<CompositeRule>();
             this.showInLegendField = true;
         }
         
@@ -15369,7 +15176,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15390,14 +15197,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeRule class constructor
-        /// </summary>
-        public CompositeRule() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.compositeSymbolizationField = new CompositeSymbolization();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -15642,7 +15441,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15657,14 +15456,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompositeSymbolization class constructor
-        /// </summary>
-        public CompositeSymbolization() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.symbolInstanceField = new BindingList<SymbolInstance>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SymbolInstance")]
         public BindingList<SymbolInstance> SymbolInstance {
             get {
@@ -15874,7 +15665,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -15929,8 +15720,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SymbolInstance() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterOverridesField = new ParameterOverrides();
             this.scaleXField = "1.0";
             this.scaleYField = "1.0";
             this.insertionOffsetXField = "0.0";
@@ -16382,7 +16171,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16397,14 +16186,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterOverrides class constructor
-        /// </summary>
-        public ParameterOverrides() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.overrideField = new BindingList<Override>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Override")]
         public BindingList<Override> Override {
             get {
@@ -16614,7 +16395,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16638,14 +16419,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// Override class constructor
-        /// </summary>
-        public Override() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.themeLabelField = new ThemeLabel();
-        }
-        
         public string SymbolName {
             get {
                 return this.symbolNameField;
@@ -16908,7 +16681,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -16926,13 +16699,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ThemeLabel class constructor
-        /// </summary>
-        public ThemeLabel() {
-            this.extendedData1Field = new ExtendedDataType();
-        }
-        
         public string Description {
             get {
                 return this.descriptionField;
@@ -17159,7 +16925,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum UsageContextType {
         
@@ -17176,7 +16942,7 @@
         Area,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum GeometryContextType {
         
@@ -17193,7 +16959,7 @@
         Polygon,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17212,8 +16978,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public LineTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.lineRuleField = new BindingList<LineRuleType>();
             this.showInLegendField = true;
         }
         
@@ -17439,7 +17203,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17463,15 +17227,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LineRuleType class constructor
-        /// </summary>
-        public LineRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemsField = new BindingList<StrokeType>();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -17735,7 +17490,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -17760,8 +17515,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public PointTypeStyleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.pointRuleField = new BindingList<PointRuleType>();
             this.showInLegendField = true;
         }
         
@@ -18011,7 +17764,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -18035,15 +17788,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointRuleType class constructor
-        /// </summary>
-        public PointRuleType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new PointSymbolization2DType();
-            this.labelField = new TextSymbolType();
-        }
-        
         public string LegendLabel {
             get {
                 return this.legendLabelField;
@@ -18307,7 +18051,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -18322,14 +18066,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PointSymbolization2DType class constructor
-        /// </summary>
-        public PointSymbolization2DType() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.itemField = new SymbolType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Block", typeof(BlockSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Font", typeof(FontSymbolType))]
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(ImageSymbolType))]
@@ -18543,7 +18279,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -18568,7 +18304,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ElevationSettingsType() {
-            this.extendedData1Field = new ExtendedDataType();
             this.zOffsetTypeField = ElevationTypeType.RelativeToGround;
             this.unitField = LengthUnitType.Centimeters;
         }
@@ -18825,7 +18560,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ElevationTypeType {
         
@@ -18836,7 +18571,7 @@
         Absolute,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/LoadProcedure-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/LoadProcedure-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/LoadProcedure-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Specification of a load procedure
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -199,7 +199,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -211,13 +211,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LoadProcedureTypeType class constructor
-        /// </summary>
-        public LoadProcedureTypeType() {
-            this.itemField = new LoadProcedureType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("DwfLoadProcedure", typeof(DwfLoadProcedureType))]
         [System.Xml.Serialization.XmlElementAttribute("DwgLoadProcedure", typeof(DwgLoadProcedureType))]
         [System.Xml.Serialization.XmlElementAttribute("RasterLoadProcedure", typeof(RasterLoadProcedureType))]
@@ -413,7 +406,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -599,7 +592,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ShpLoadProcedureType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DwfLoadProcedureType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SdfLoadProcedureType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -662,14 +655,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LoadProcedureType class constructor
-        /// </summary>
-        public LoadProcedureType() {
-            this.resourceIdField = new BindingList<string>();
-            this.sourceFileField = new BindingList<string>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SourceFile")]
         public BindingList<string> SourceFile {
             get {
@@ -1134,7 +1119,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1357,7 +1342,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1381,13 +1366,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DwgComponentType class constructor
-        /// </summary>
-        public DwgComponentType() {
-            this.childrenField = new BindingList<DwgComponentType>();
-        }
-        
         public DwgComponentTypeType Type {
             get {
                 return this.typeField;
@@ -1639,7 +1617,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum DwgComponentTypeType {
         
@@ -1671,7 +1649,7 @@
         Theme,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1933,7 +1911,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1960,14 +1938,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DwgLoadProcedureType class constructor
-        /// </summary>
-        public DwgLoadProcedureType() {
-            this.dwgDriveAliasField = new BindingList<DwgDriveAliasType>();
-            this.componentsField = new BindingList<DwgComponentType>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("Component", IsNullable=false)]
         public BindingList<DwgComponentType> Components {
             get {
@@ -2226,7 +2196,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum DwgResourceTypeType {
         
@@ -2237,7 +2207,7 @@
         Drawing,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2258,13 +2228,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RasterLoadProcedureType class constructor
-        /// </summary>
-        public RasterLoadProcedureType() {
-            this.geoReferenceOverrideField = new BindingList<GeoReferenceOverrideType>();
-        }
-        
         public string FeatureSourceName {
             get {
                 return this.featureSourceNameField;
@@ -2498,7 +2461,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum OverlapTreatmentType {
         
@@ -2512,7 +2475,7 @@
         ForegroundOff,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2723,7 +2686,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2934,7 +2897,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum SdfKeyTreatmentType {
         

Modified: sandbox/maestro-2.5/Generated/LoadProcedure-1.1.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/LoadProcedure-1.1.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/LoadProcedure-1.1.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Specification of a load procedure
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -225,7 +225,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -237,13 +237,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LoadProcedureTypeType class constructor
-        /// </summary>
-        public LoadProcedureTypeType() {
-            this.itemField = new LoadProcedureType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("DwfLoadProcedure", typeof(DwfLoadProcedureType))]
         [System.Xml.Serialization.XmlElementAttribute("DwgLoadProcedure", typeof(DwgLoadProcedureType))]
         [System.Xml.Serialization.XmlElementAttribute("RasterLoadProcedure", typeof(RasterLoadProcedureType))]
@@ -439,7 +432,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -625,7 +618,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ShpLoadProcedureType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DwfLoadProcedureType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SdfLoadProcedureType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -688,14 +681,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LoadProcedureType class constructor
-        /// </summary>
-        public LoadProcedureType() {
-            this.resourceIdField = new BindingList<string>();
-            this.sourceFileField = new BindingList<string>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SourceFile")]
         public BindingList<string> SourceFile {
             get {
@@ -1160,7 +1145,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1377,7 +1362,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1392,13 +1377,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DwgFileComponentType class constructor
-        /// </summary>
-        public DwgFileComponentType() {
-            this.layerComponentsField = new BindingList<DwgLayerComponentType>();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -1608,7 +1586,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1870,7 +1848,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1888,13 +1866,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DwgLoadProcedureType class constructor
-        /// </summary>
-        public DwgLoadProcedureType() {
-            this.fileComponentsField = new BindingList<DwgFileComponentType>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("FileComponent", IsNullable=false)]
         public BindingList<DwgFileComponentType> FileComponents {
             get {
@@ -2110,7 +2081,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2131,13 +2102,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RasterLoadProcedureType class constructor
-        /// </summary>
-        public RasterLoadProcedureType() {
-            this.geoReferenceOverrideField = new BindingList<GeoReferenceOverrideType>();
-        }
-        
         public string FeatureSourceName {
             get {
                 return this.featureSourceNameField;
@@ -2371,7 +2335,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum OverlapTreatmentType {
         
@@ -2385,7 +2349,7 @@
         ForegroundOff,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2596,7 +2560,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2807,7 +2771,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum SdfKeyTreatmentType {
         

Modified: sandbox/maestro-2.5/Generated/LoadProcedure-2.2.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/LoadProcedure-2.2.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/LoadProcedure-2.2.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Specification of a load procedure
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -225,7 +225,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -237,13 +237,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LoadProcedureTypeType class constructor
-        /// </summary>
-        public LoadProcedureTypeType() {
-            this.itemField = new LoadProcedureType();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("DwfLoadProcedure", typeof(DwfLoadProcedureType))]
         [System.Xml.Serialization.XmlElementAttribute("DwgLoadProcedure", typeof(DwgLoadProcedureType))]
         [System.Xml.Serialization.XmlElementAttribute("RasterLoadProcedure", typeof(RasterLoadProcedureType))]
@@ -440,7 +433,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -627,7 +620,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(DwfLoadProcedureType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SQLiteLoadProcedureType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SdfLoadProcedureType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -690,14 +683,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LoadProcedureType class constructor
-        /// </summary>
-        public LoadProcedureType() {
-            this.resourceIdField = new BindingList<string>();
-            this.sourceFileField = new BindingList<string>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SourceFile")]
         public BindingList<string> SourceFile {
             get {
@@ -1162,7 +1147,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1379,7 +1364,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1394,13 +1379,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DwgFileComponentType class constructor
-        /// </summary>
-        public DwgFileComponentType() {
-            this.layerComponentsField = new BindingList<DwgLayerComponentType>();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -1610,7 +1588,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1872,7 +1850,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1890,13 +1868,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// DwgLoadProcedureType class constructor
-        /// </summary>
-        public DwgLoadProcedureType() {
-            this.fileComponentsField = new BindingList<DwgFileComponentType>();
-        }
-        
         [System.Xml.Serialization.XmlArrayItemAttribute("FileComponent", IsNullable=false)]
         public BindingList<DwgFileComponentType> FileComponents {
             get {
@@ -2112,7 +2083,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2133,13 +2104,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RasterLoadProcedureType class constructor
-        /// </summary>
-        public RasterLoadProcedureType() {
-            this.geoReferenceOverrideField = new BindingList<GeoReferenceOverrideType>();
-        }
-        
         public string FeatureSourceName {
             get {
                 return this.featureSourceNameField;
@@ -2373,7 +2337,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum OverlapTreatmentType {
         
@@ -2387,7 +2351,7 @@
         ForegroundOff,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2598,7 +2562,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2794,7 +2758,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3005,7 +2969,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum SdfKeyTreatmentType {
         

Modified: sandbox/maestro-2.5/Generated/MapDefinition-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/MapDefinition-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/MapDefinition-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.MapDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.MapDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition {
@@ -17,7 +17,7 @@
     /// <summary>
     /// A MapDefinition defines the collection of layers, groupings of layers, and base map
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -199,7 +199,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -232,16 +232,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MapDefinitionType class constructor
-        /// </summary>
-        public MapDefinitionType() {
-            this.baseMapDefinitionField = new MapDefinitionTypeBaseMapDefinition();
-            this.mapLayerGroupField = new BindingList<MapLayerGroupType>();
-            this.mapLayerField = new BindingList<MapLayerType>();
-            this.extentsField = new Box2DType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;
@@ -561,7 +551,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -804,7 +794,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BaseMapLayerGroupCommonType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MapLayerGroupType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1072,7 +1062,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1084,13 +1074,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// BaseMapLayerGroupCommonType class constructor
-        /// </summary>
-        public BaseMapLayerGroupCommonType() {
-            this.baseMapLayerField = new BindingList<BaseMapLayerType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("BaseMapLayer")]
         public BindingList<BaseMapLayerType> BaseMapLayer {
             get {
@@ -1283,7 +1266,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MapLayerType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1572,7 +1555,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1789,7 +1772,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1991,7 +1974,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2006,14 +1989,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MapDefinitionTypeBaseMapDefinition class constructor
-        /// </summary>
-        public MapDefinitionTypeBaseMapDefinition() {
-            this.baseMapLayerGroupField = new BindingList<BaseMapLayerGroupCommonType>();
-            this.finiteDisplayScaleField = new BindingList<double>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("FiniteDisplayScale")]
         public BindingList<double> FiniteDisplayScale {
             get {

Modified: sandbox/maestro-2.5/Generated/PlatformCommon-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/PlatformCommon-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/PlatformCommon-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -22,19 +22,12 @@
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }

Modified: sandbox/maestro-2.5/Generated/PrintLayout-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/PrintLayout-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/PrintLayout-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.PrintLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.PrintLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.PrintLayout {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -36,16 +36,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PrintLayout class constructor
-        /// </summary>
-        public PrintLayout() {
-            this.customTextField = new BindingList<PrintLayoutText>();
-            this.customLogosField = new BindingList<PrintLayoutLogo>();
-            this.layoutPropertiesField = new PrintLayoutLayoutProperties();
-            this.pagePropertiesField = new PrintLayoutPageProperties();
-        }
-        
         public PrintLayoutPageProperties PageProperties {
             get {
                 return this.pagePropertiesField;
@@ -292,7 +282,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -304,13 +294,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PrintLayoutPageProperties class constructor
-        /// </summary>
-        public PrintLayoutPageProperties() {
-            this.backgroundColorField = new PrintLayoutPagePropertiesBackgroundColor();
-        }
-        
         public PrintLayoutPagePropertiesBackgroundColor BackgroundColor {
             get {
                 return this.backgroundColorField;
@@ -501,7 +484,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -748,7 +731,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1177,7 +1160,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1204,14 +1187,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PrintLayoutLogo class constructor
-        /// </summary>
-        public PrintLayoutLogo() {
-            this.sizeField = new PrintLayoutLogoSize();
-            this.positionField = new PrintLayoutLogoPosition();
-        }
-        
         public PrintLayoutLogoPosition Position {
             get {
                 return this.positionField;
@@ -1481,7 +1456,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1713,7 +1688,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1945,7 +1920,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1963,14 +1938,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PrintLayoutText class constructor
-        /// </summary>
-        public PrintLayoutText() {
-            this.fontField = new PrintLayoutTextFont();
-            this.positionField = new PrintLayoutTextPosition();
-        }
-        
         public PrintLayoutTextPosition Position {
             get {
                 return this.positionField;
@@ -2197,7 +2164,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2429,7 +2396,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/RepositoryList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/RepositoryList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/RepositoryList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -219,7 +219,7 @@
     /// <summary>
     /// Repository list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -232,13 +232,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RepositoryList class constructor
-        /// </summary>
-        public RepositoryList() {
-            this.repositoryField = new BindingList<RepositoryListRepository>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Repository")]
         public BindingList<RepositoryListRepository> Repository {
             get {
@@ -430,7 +423,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -445,13 +438,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RepositoryListRepository class constructor
-        /// </summary>
-        public RepositoryListRepository() {
-            this.repositoryContentField = new RepositoryContentType();
-        }
-        
         public string Name {
             get {
                 return this.nameField;

Modified: sandbox/maestro-2.5/Generated/ResourceDataList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/ResourceDataList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/ResourceDataList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Resource Data list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceDataList class constructor
-        /// </summary>
-        public ResourceDataList() {
-            this.resourceDataField = new BindingList<ResourceDataListResourceData>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("ResourceData")]
         public BindingList<ResourceDataListResourceData> ResourceData {
             get {
@@ -228,7 +221,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -445,7 +438,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum ResourceDataType {
         

Modified: sandbox/maestro-2.5/Generated/ResourceList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/ResourceList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/ResourceList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -26,13 +26,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceFolderHeaderType class constructor
-        /// </summary>
-        public ResourceFolderHeaderType() {
-            this.securityField = new ResourceSecurityType();
-        }
-        
         public ResourceSecurityType Security {
             get {
                 return this.securityField;
@@ -223,7 +216,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -240,14 +233,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceSecurityType class constructor
-        /// </summary>
-        public ResourceSecurityType() {
-            this.groupsField = new ResourceSecurityTypeGroups();
-            this.usersField = new ResourceSecurityTypeUsers();
-        }
-        
         public bool Inherited {
             get {
                 return this.inheritedField;
@@ -468,7 +453,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -480,13 +465,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceSecurityTypeUsers class constructor
-        /// </summary>
-        public ResourceSecurityTypeUsers() {
-            this.userField = new BindingList<ResourceSecurityTypeUsersUser>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("User")]
         public BindingList<ResourceSecurityTypeUsersUser> User {
             get {
@@ -678,7 +656,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -895,7 +873,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum PermissionsType {
         
@@ -910,7 +888,7 @@
         rw,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -922,13 +900,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceSecurityTypeGroups class constructor
-        /// </summary>
-        public ResourceSecurityTypeGroups() {
-            this.groupField = new BindingList<ResourceSecurityTypeGroupsGroup>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Group")]
         public BindingList<ResourceSecurityTypeGroupsGroup> Group {
             get {
@@ -1120,7 +1091,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1337,7 +1308,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1355,15 +1326,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceDocumentHeaderType class constructor
-        /// </summary>
-        public ResourceDocumentHeaderType() {
-            this.metadataField = new ResourceDocumentHeaderTypeMetadata();
-            this.securityField = new ResourceSecurityType();
-            this.generalField = new ResourceDocumentHeaderTypeGeneral();
-        }
-        
         public ResourceDocumentHeaderTypeGeneral General {
             get {
                 return this.generalField;
@@ -1590,7 +1552,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1792,7 +1754,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1804,13 +1766,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceDocumentHeaderTypeMetadata class constructor
-        /// </summary>
-        public ResourceDocumentHeaderTypeMetadata() {
-            this.simpleField = new ResourceDocumentHeaderTypeMetadataSimple();
-        }
-        
         public ResourceDocumentHeaderTypeMetadataSimple Simple {
             get {
                 return this.simpleField;
@@ -2001,7 +1956,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2013,13 +1968,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceDocumentHeaderTypeMetadataSimple class constructor
-        /// </summary>
-        public ResourceDocumentHeaderTypeMetadataSimple() {
-            this.propertyField = new BindingList<ResourceDocumentHeaderTypeMetadataSimpleProperty>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Property")]
         public BindingList<ResourceDocumentHeaderTypeMetadataSimpleProperty> Property {
             get {
@@ -2211,7 +2159,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2437,7 +2385,7 @@
     /// <summary>
     /// Resource list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2450,13 +2398,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceList class constructor
-        /// </summary>
-        public ResourceList() {
-            this.itemsField = new BindingList<object>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("ResourceDocument", typeof(ResourceListResourceDocument))]
         [System.Xml.Serialization.XmlElementAttribute("ResourceFolder", typeof(ResourceListResourceFolder))]
         public BindingList<object> Items {
@@ -2649,7 +2590,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2676,13 +2617,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceListResourceDocument class constructor
-        /// </summary>
-        public ResourceListResourceDocument() {
-            this.resourceDocumentHeaderField = new ResourceDocumentHeaderType();
-        }
-        
         public string ResourceId {
             get {
                 return this.resourceIdField;
@@ -2952,7 +2886,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2985,13 +2919,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceListResourceFolder class constructor
-        /// </summary>
-        public ResourceListResourceFolder() {
-            this.resourceFolderHeaderField = new ResourceFolderHeaderType();
-        }
-        
         public string ResourceId {
             get {
                 return this.resourceIdField;

Modified: sandbox/maestro-2.5/Generated/ResourcePackageManifest-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/ResourcePackageManifest-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/ResourcePackageManifest-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Resource Package manifest
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -34,13 +34,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// ResourcePackageManifest class constructor
-        /// </summary>
-        public ResourcePackageManifest() {
-            this.operationsField = new ResourcePackageManifestOperations();
-        }
-        
-        /// <summary>
         /// Optional description of the resource package
         /// </summary>
         public string Description {
@@ -257,7 +250,7 @@
     /// <summary>
     /// List of operations
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -269,13 +262,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourcePackageManifestOperations class constructor
-        /// </summary>
-        public ResourcePackageManifestOperations() {
-            this.operationField = new BindingList<ResourcePackageManifestOperationsOperation>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Operation")]
         public BindingList<ResourcePackageManifestOperationsOperation> Operation {
             get {
@@ -467,7 +453,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -486,13 +472,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// ResourcePackageManifestOperationsOperation class constructor
-        /// </summary>
-        public ResourcePackageManifestOperationsOperation() {
-            this.parametersField = new ResourcePackageManifestOperationsOperationParameters();
-        }
-        
-        /// <summary>
         /// Name of the operation
         /// </summary>
         public string Name {
@@ -730,7 +709,7 @@
     /// <summary>
     /// List of operarion parameters
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -743,13 +722,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// ResourcePackageManifestOperationsOperationParameters class constructor
-        /// </summary>
-        public ResourcePackageManifestOperationsOperationParameters() {
-            this.parameterField = new BindingList<ResourcePackageManifestOperationsOperationParametersParameter>();
-        }
-        
-        /// <summary>
         /// operation parameter
         /// </summary>
         [System.Xml.Serialization.XmlElementAttribute("Parameter")]
@@ -946,7 +918,7 @@
     /// <summary>
     /// operation parameter
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/ResourceReferenceList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/ResourceReferenceList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/ResourceReferenceList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>True</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>True</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Resource Reference list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResourceReferenceList class constructor
-        /// </summary>
-        public ResourceReferenceList() {
-            this.resourceIdField = new BindingList<string>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("ResourceId")]
         public BindingList<string> ResourceId {
             get {

Modified: sandbox/maestro-2.5/Generated/Role-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/Role-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/Role-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Role
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -36,14 +36,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// Role class constructor
-        /// </summary>
-        public Role() {
-            this.groupsField = new RoleGroups();
-            this.usersField = new RoleUsers();
-        }
-        
         public string Description {
             get {
                 return this.descriptionField;
@@ -270,7 +262,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -282,13 +274,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RoleUsers class constructor
-        /// </summary>
-        public RoleUsers() {
-            this.userField = new BindingList<RoleUsersUser>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("User")]
         public BindingList<RoleUsersUser> User {
             get {
@@ -480,7 +465,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -682,7 +667,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -694,13 +679,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// RoleGroups class constructor
-        /// </summary>
-        public RoleGroups() {
-            this.groupField = new BindingList<RoleGroupsGroup>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Group")]
         public BindingList<RoleGroupsGroup> Group {
             get {
@@ -892,7 +870,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/SelectAggregate-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/SelectAggregate-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/SelectAggregate-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -29,14 +29,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PropertySetType class constructor
-        /// </summary>
-        public PropertySetType() {
-            this.propertiesField = new PropertySetTypeProperties();
-            this.propertyDefinitionsField = new PropertySetTypePropertyDefinitions();
-        }
-        
         public PropertySetTypePropertyDefinitions PropertyDefinitions {
             get {
                 return this.propertyDefinitionsField;
@@ -245,7 +237,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -257,13 +249,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PropertySetTypePropertyDefinitions class constructor
-        /// </summary>
-        public PropertySetTypePropertyDefinitions() {
-            this.propertyDefinitionField = new BindingList<PropertyDefinitionType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("PropertyDefinition")]
         public BindingList<PropertyDefinitionType> PropertyDefinition {
             get {
@@ -455,7 +440,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -672,7 +657,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public enum PropertyDefinitionTypeType {
@@ -717,7 +702,7 @@
         geometry,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -940,7 +925,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1121,7 +1106,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1302,7 +1287,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1483,7 +1468,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1495,13 +1480,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PropertySetTypeProperties class constructor
-        /// </summary>
-        public PropertySetTypeProperties() {
-            this.propertyCollectionField = new BindingList<PropertySetTypePropertiesPropertyCollection>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("PropertyCollection")]
         public BindingList<PropertySetTypePropertiesPropertyCollection> PropertyCollection {
             get {
@@ -1693,7 +1671,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1705,13 +1683,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PropertySetTypePropertiesPropertyCollection class constructor
-        /// </summary>
-        public PropertySetTypePropertiesPropertyCollection() {
-            this.propertyField = new BindingList<PropertyType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Property")]
         public BindingList<PropertyType> Property {
             get {

Modified: sandbox/maestro-2.5/Generated/Server-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/Server-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/Server-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>True</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>True</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/ServerList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/ServerList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/ServerList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>True</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>True</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Server list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ServerList class constructor
-        /// </summary>
-        public ServerList() {
-            this.serverField = new BindingList<ServerType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Server")]
         public BindingList<ServerType> Server {
             get {

Modified: sandbox/maestro-2.5/Generated/SiteInformation-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/SiteInformation-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/SiteInformation-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Site Information
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -33,14 +33,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// SiteInformation class constructor
-        /// </summary>
-        public SiteInformation() {
-            this.statisticsField = new SiteInformationStatistics();
-            this.siteServerField = new SiteInformationSiteServer();
-        }
-        
         public SiteInformationSiteServer SiteServer {
             get {
                 return this.siteServerField;
@@ -249,7 +241,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -270,13 +262,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// SiteInformationSiteServer class constructor
-        /// </summary>
-        public SiteInformationSiteServer() {
-            this.operatingSystemField = new SiteInformationSiteServerOperatingSystem();
-        }
-        
         public string DisplayName {
             get {
                 return this.displayNameField;
@@ -521,7 +506,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -811,7 +796,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/SiteVersion-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/SiteVersion-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/SiteVersion-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Site Version
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/StringCollection-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/StringCollection-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/StringCollection-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// String list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// StringCollection class constructor
-        /// </summary>
-        public StringCollection() {
-            this.itemField = new BindingList<string>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Item")]
         public BindingList<string> Item {
             get {

Modified: sandbox/maestro-2.5/Generated/SymbolDefinition-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/SymbolDefinition-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/SymbolDefinition-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -225,7 +225,7 @@
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -256,19 +256,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// SimpleSymbolDefinition class constructor
-        /// </summary>
-        public SimpleSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterDefinitionField = new ParameterDefinition();
-            this.areaUsageField = new AreaUsage();
-            this.lineUsageField = new LineUsage();
-            this.pointUsageField = new PointUsage();
-            this.resizeBoxField = new ResizeBox();
-            this.graphicsField = new BindingList<GraphicBase>();
-        }
-        
-        /// <summary>
         /// The collection of graphic elements defining this symbol.
         /// </summary>
         [System.Xml.Serialization.XmlArrayItemAttribute(typeof(Image), IsNullable=false)]
@@ -587,7 +574,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -621,7 +608,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Image() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.sizeScalableField = "true";
@@ -952,7 +938,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1175,7 +1161,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1194,7 +1180,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SimpleSymbol() {
-            this.extendedData1Field = new ExtendedDataType();
             this.renderingPassField = "0";
         }
         
@@ -1430,26 +1415,19 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -1639,7 +1617,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1667,7 +1645,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Parameter() {
-            this.extendedData1Field = new ExtendedDataType();
             this.dataTypeField = DataType.String;
         }
         
@@ -1961,7 +1938,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum DataType {
         
@@ -1984,7 +1961,7 @@
     /// <summary>
     /// The list of parameters used in this symbol.  If a parameter is not listed here this is considered a bug in the symbol definition.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1999,14 +1976,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterDefinition class constructor
-        /// </summary>
-        public ParameterDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterField = new BindingList<Parameter>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Parameter")]
         public BindingList<Parameter> Parameter {
             get {
@@ -2219,7 +2188,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of area features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2259,7 +2228,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public AreaUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.originControlField = "\'Global\'";
             this.clippingControlField = "\'Clip\'";
@@ -2662,7 +2630,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of linear features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2708,8 +2676,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public LineUsage() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.defaultPathField = new Path();
             this.angleControlField = "\'FromGeometry\'";
             this.unitsControlField = "\'Absolute\'";
             this.vertexControlField = "\'OverlapNone\'";
@@ -3153,7 +3119,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3190,7 +3156,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Path() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lineWeightField = "0.0";
             this.lineWeightScalableField = "true";
             this.lineCapField = "\'Round\'";
@@ -3540,7 +3505,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Text))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Image))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Path))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3747,7 +3712,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3811,8 +3776,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Text() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.frameField = new TextFrame();
             this.fontNameField = "\'Arial\'";
             this.boldField = "false";
             this.italicField = "false";
@@ -4338,7 +4301,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4363,7 +4326,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextFrame() {
-            this.extendedData1Field = new ExtendedDataType();
             this.offsetXField = "0.0";
             this.offsetYField = "0.0";
         }
@@ -4635,7 +4597,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of point features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4660,7 +4622,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public PointUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.angleField = "0.0";
             this.originOffsetXField = "0.0";
@@ -4948,7 +4909,7 @@
     /// <summary>
     /// The optional box used to resize and reposition select graphic elements.  The graphical extent of all elements with ResizeControl set to AddToResizeBox will be added to this box, potentially causing it to grow in size.  Any change in size causes all elements with ResizeControl set to AdjustToResizeBox to be proportionally resized and repositioned.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4976,7 +4937,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ResizeBox() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.positionXField = "0.0";
@@ -5281,7 +5241,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(CompoundSymbolDefinition))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SimpleSymbolDefinition))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5507,7 +5467,7 @@
     /// <summary>
     /// A 2D compound symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5522,14 +5482,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompoundSymbolDefinition class constructor
-        /// </summary>
-        public CompoundSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.simpleSymbolField = new BindingList<SimpleSymbol>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SimpleSymbol")]
         public BindingList<SimpleSymbol> SimpleSymbol {
             get {
@@ -5739,7 +5691,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5950,7 +5902,7 @@
     /// <summary>
     /// The collection of graphic elements defining this symbol.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5962,13 +5914,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// Graphics class constructor
-        /// </summary>
-        public Graphics() {
-            this.itemsField = new BindingList<GraphicBase>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(Image))]
         [System.Xml.Serialization.XmlElementAttribute("Path", typeof(Path))]
         [System.Xml.Serialization.XmlElementAttribute("Text", typeof(Text))]

Modified: sandbox/maestro-2.5/Generated/SymbolDefinition-1.1.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/SymbolDefinition-1.1.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/SymbolDefinition-1.1.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -225,7 +225,7 @@
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -256,19 +256,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         /// <summary>
-        /// SimpleSymbolDefinition class constructor
-        /// </summary>
-        public SimpleSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterDefinitionField = new ParameterDefinition();
-            this.areaUsageField = new AreaUsage();
-            this.lineUsageField = new LineUsage();
-            this.pointUsageField = new PointUsage();
-            this.resizeBoxField = new ResizeBox();
-            this.graphicsField = new BindingList<GraphicBase>();
-        }
-        
-        /// <summary>
         /// The collection of graphic elements defining this symbol.
         /// </summary>
         [System.Xml.Serialization.XmlArrayItemAttribute(typeof(Image), IsNullable=false)]
@@ -587,7 +574,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -621,7 +608,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Image() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.sizeScalableField = "true";
@@ -952,7 +938,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1175,7 +1161,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1194,7 +1180,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public SimpleSymbol() {
-            this.extendedData1Field = new ExtendedDataType();
             this.renderingPassField = "0";
         }
         
@@ -1430,26 +1415,19 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged {
         
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private System.Xml.XmlElement[] anyField;
+        private BindingList<System.Xml.XmlElement> anyField;
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ExtendedDataType class constructor
-        /// </summary>
-        public ExtendedDataType() {
-            this.anyField = new System.Xml.XmlElement[0];
-        }
-        
         [System.Xml.Serialization.XmlAnyElementAttribute()]
-        public System.Xml.XmlElement[] Any {
+        public BindingList<System.Xml.XmlElement> Any {
             get {
                 return this.anyField;
             }
@@ -1639,7 +1617,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1667,7 +1645,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Parameter() {
-            this.extendedData1Field = new ExtendedDataType();
             this.dataTypeField = DataType.String;
         }
         
@@ -1961,7 +1938,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum DataType {
         
@@ -2062,7 +2039,7 @@
     /// <summary>
     /// The list of parameters used in this symbol.  If a parameter is not listed here this is considered a bug in the symbol definition.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2077,14 +2054,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ParameterDefinition class constructor
-        /// </summary>
-        public ParameterDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.parameterField = new BindingList<Parameter>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Parameter")]
         public BindingList<Parameter> Parameter {
             get {
@@ -2297,7 +2266,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of area features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2337,7 +2306,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public AreaUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.originControlField = "\'Global\'";
             this.clippingControlField = "\'Clip\'";
@@ -2740,7 +2708,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of linear features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2786,8 +2754,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public LineUsage() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.defaultPathField = new Path();
             this.angleControlField = "\'FromGeometry\'";
             this.unitsControlField = "\'Absolute\'";
             this.vertexControlField = "\'OverlapWrap\'";
@@ -3227,7 +3193,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3264,7 +3230,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Path() {
-            this.extendedData1Field = new ExtendedDataType();
             this.lineWeightField = "0.0";
             this.lineWeightScalableField = "true";
             this.lineCapField = "\'Round\'";
@@ -3614,7 +3579,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Text))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Image))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(Path))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3821,7 +3786,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3897,8 +3862,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Text() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.frameField = new TextFrame();
             this.fontNameField = "\'Arial\'";
             this.boldField = "false";
             this.italicField = "false";
@@ -4504,7 +4467,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4529,7 +4492,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public TextFrame() {
-            this.extendedData1Field = new ExtendedDataType();
             this.offsetXField = "0.0";
             this.offsetYField = "0.0";
         }
@@ -4801,7 +4763,7 @@
     /// <summary>
     /// Specifies how the symbol is used in the context of point features.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4826,7 +4788,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public PointUsage() {
-            this.extendedData1Field = new ExtendedDataType();
             this.angleControlField = "\'FromAngle\'";
             this.angleField = "0.0";
             this.originOffsetXField = "0.0";
@@ -5114,7 +5075,7 @@
     /// <summary>
     /// The optional box used to resize and reposition select graphic elements.  The graphical extent of all elements with ResizeControl set to AddToResizeBox will be added to this box, potentially causing it to grow in size.  Any change in size causes all elements with ResizeControl set to AdjustToResizeBox to be proportionally resized and repositioned.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5142,7 +5103,6 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public ResizeBox() {
-            this.extendedData1Field = new ExtendedDataType();
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.positionXField = "0.0";
@@ -5447,7 +5407,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(CompoundSymbolDefinition))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SimpleSymbolDefinition))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5673,7 +5633,7 @@
     /// <summary>
     /// A 2D compound symbol for stylization.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5688,14 +5648,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CompoundSymbolDefinition class constructor
-        /// </summary>
-        public CompoundSymbolDefinition() {
-            this.extendedData1Field = new ExtendedDataType();
-            this.simpleSymbolField = new BindingList<SimpleSymbol>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("SimpleSymbol")]
         public BindingList<SimpleSymbol> SimpleSymbol {
             get {
@@ -5905,7 +5857,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6116,7 +6068,7 @@
     /// <summary>
     /// The collection of graphic elements defining this symbol.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6128,13 +6080,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// Graphics class constructor
-        /// </summary>
-        public Graphics() {
-            this.itemsField = new BindingList<GraphicBase>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Image", typeof(Image))]
         [System.Xml.Serialization.XmlElementAttribute("Path", typeof(Path))]
         [System.Xml.Serialization.XmlElementAttribute("Text", typeof(Text))]

Modified: sandbox/maestro-2.5/Generated/SymbolLibrary-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/SymbolLibrary-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/SymbolLibrary-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolLibrary</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolLibrary</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -29,13 +29,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// SymbolLibraryType class constructor
-        /// </summary>
-        public SymbolLibraryType() {
-            this.symbolField = new BindingList<SymbolType>();
-        }
-        
         public string Description {
             get {
                 return this.descriptionField;
@@ -245,7 +238,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/Types-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/Types-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/Types-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {

Modified: sandbox/maestro-2.5/Generated/UnmanagedDataList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/UnmanagedDataList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/UnmanagedDataList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// Unmanaged data list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// UnmanagedDataList class constructor
-        /// </summary>
-        public UnmanagedDataList() {
-            this.itemsField = new BindingList<object>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("UnmanagedDataFile", typeof(UnmanagedDataListUnmanagedDataFile))]
         [System.Xml.Serialization.XmlElementAttribute("UnmanagedDataFolder", typeof(UnmanagedDataListUnmanagedDataFolder))]
         public BindingList<object> Items {
@@ -229,7 +222,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -483,7 +476,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/User-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/User-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/User-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// User
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/UserList-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/UserList-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/UserList-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.Common {
@@ -17,7 +17,7 @@
     /// <summary>
     /// User list
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -30,13 +30,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// UserList class constructor
-        /// </summary>
-        public UserList() {
-            this.itemsField = new BindingList<object>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Group", typeof(UserListGroup))]
         [System.Xml.Serialization.XmlElementAttribute("User", typeof(UserListUser))]
         public BindingList<object> Items {
@@ -229,7 +222,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -452,7 +445,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]

Modified: sandbox/maestro-2.5/Generated/WebLayout-1.0.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/WebLayout-1.0.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/WebLayout-1.0.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.WebLayout {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -50,20 +50,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// WebLayoutType class constructor
-        /// </summary>
-        public WebLayoutType() {
-            this.commandSetField = new BindingList<CommandType>();
-            this.zoomControlField = new ZoomControlType();
-            this.statusBarField = new StatusBarType();
-            this.taskPaneField = new TaskPaneType();
-            this.contextMenuField = new ContextMenuType();
-            this.informationPaneField = new InformationPaneType();
-            this.toolBarField = new ToolBarType();
-            this.mapField = new MapType();
-        }
-        
         public string Title {
             get {
                 return this.titleField;
@@ -399,7 +385,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -417,13 +403,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MapType class constructor
-        /// </summary>
-        public MapType() {
-            this.initialViewField = new MapViewType();
-        }
-        
         public MapViewType InitialView {
             get {
                 return this.initialViewField;
@@ -644,7 +623,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -870,7 +849,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1093,7 +1072,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1329,7 +1308,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InvokeURLCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BasicCommandType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1651,7 +1630,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum TargetViewerType {
         
@@ -1676,7 +1655,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BufferCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InvokeURLCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchCommandType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1857,7 +1836,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2059,7 +2038,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2071,13 +2050,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PrintCommandType class constructor
-        /// </summary>
-        public PrintCommandType() {
-            this.printLayoutField = new BindingList<ResourceReferenceType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("PrintLayout")]
         public BindingList<ResourceReferenceType> PrintLayout {
             get {
@@ -2270,7 +2242,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MapType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2480,7 +2452,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BufferCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InvokeURLCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchCommandType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2697,7 +2669,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum TargetType {
         
@@ -2711,7 +2683,7 @@
         SpecifiedFrame,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2913,7 +2885,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3094,7 +3066,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3275,7 +3247,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3456,7 +3428,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3637,7 +3609,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3818,7 +3790,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3839,14 +3811,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// InvokeURLCommandType class constructor
-        /// </summary>
-        public InvokeURLCommandType() {
-            this.additionalParameterField = new BindingList<ParameterPairType>();
-            this.layerSetField = new BindingList<string>();
-        }
-        
         public string URL {
             get {
                 return this.uRLField;
@@ -4087,7 +4051,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4111,13 +4075,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// SearchCommandType class constructor
-        /// </summary>
-        public SearchCommandType() {
-            this.resultColumnsField = new BindingList<ResultColumnType>();
-        }
-        
         public string Layer {
             get {
                 return this.layerField;
@@ -4382,7 +4339,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4578,7 +4535,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum BasicCommandActionType {
         
@@ -4649,7 +4606,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(CommandItemType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SeparatorItemType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(FlyoutItemType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4845,7 +4802,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum UIItemFunctionType {
         
@@ -4859,7 +4816,7 @@
         Flyout,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5061,7 +5018,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5242,7 +5199,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5269,13 +5226,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FlyoutItemType class constructor
-        /// </summary>
-        public FlyoutItemType() {
-            this.subItemField = new BindingList<UIItemType>();
-        }
-        
         public string Label {
             get {
                 return this.labelField;
@@ -5557,7 +5507,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5851,7 +5801,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(WebLayoutResizableControlType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TaskPaneType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InformationPaneType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6047,7 +5997,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6228,7 +6178,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6409,7 +6359,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6421,13 +6371,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ContextMenuType class constructor
-        /// </summary>
-        public ContextMenuType() {
-            this.menuItemField = new BindingList<UIItemType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("MenuItem")]
         public BindingList<UIItemType> MenuItem {
             get {
@@ -6619,7 +6562,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6631,13 +6574,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ToolBarType class constructor
-        /// </summary>
-        public ToolBarType() {
-            this.buttonField = new BindingList<UIItemType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Button")]
         public BindingList<UIItemType> Button {
             get {
@@ -6829,7 +6765,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6853,17 +6789,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// TaskBarType class constructor
-        /// </summary>
-        public TaskBarType() {
-            this.menuButtonField = new BindingList<UIItemType>();
-            this.tasksField = new TaskButtonType();
-            this.backField = new TaskButtonType();
-            this.forwardField = new TaskButtonType();
-            this.homeField = new TaskButtonType();
-        }
-        
         public TaskButtonType Home {
             get {
                 return this.homeField;
@@ -7129,7 +7054,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TaskPaneType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InformationPaneType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7325,7 +7250,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7340,13 +7265,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// TaskPaneType class constructor
-        /// </summary>
-        public TaskPaneType() {
-            this.taskBarField = new TaskBarType();
-        }
-        
         public TaskBarType TaskBar {
             get {
                 return this.taskBarField;
@@ -7555,7 +7473,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7766,7 +7684,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7778,13 +7696,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CommandSetType class constructor
-        /// </summary>
-        public CommandSetType() {
-            this.commandField = new BindingList<CommandType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Command")]
         public BindingList<CommandType> Command {
             get {
@@ -7976,7 +7887,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7988,13 +7899,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LayerSetType class constructor
-        /// </summary>
-        public LayerSetType() {
-            this.layerField = new BindingList<string>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Layer")]
         public BindingList<string> Layer {
             get {
@@ -8186,7 +8090,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8198,13 +8102,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResultColumnSetType class constructor
-        /// </summary>
-        public ResultColumnSetType() {
-            this.columnField = new BindingList<ResultColumnType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Column")]
         public BindingList<ResultColumnType> Column {
             get {

Modified: sandbox/maestro-2.5/Generated/WebLayout-1.1.0.designer.cs
===================================================================
--- sandbox/maestro-2.5/Generated/WebLayout-1.1.0.designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Generated/WebLayout-1.1.0.designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//    Generated by Xsd2Code. Version 3.3.0.20459
-//    <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
+//    Generated by Xsd2Code. Version 3.3.0.33001
+//    <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.WebLayout {
@@ -14,7 +14,7 @@
     using System.IO;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -56,20 +56,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// WebLayoutType class constructor
-        /// </summary>
-        public WebLayoutType() {
-            this.commandSetField = new BindingList<CommandType>();
-            this.zoomControlField = new ZoomControlType();
-            this.statusBarField = new StatusBarType();
-            this.taskPaneField = new TaskPaneType();
-            this.contextMenuField = new ContextMenuType();
-            this.informationPaneField = new InformationPaneType();
-            this.toolBarField = new ToolBarType();
-            this.mapField = new MapType();
-        }
-        
         public string Title {
             get {
                 return this.titleField;
@@ -430,7 +416,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -448,13 +434,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// MapType class constructor
-        /// </summary>
-        public MapType() {
-            this.initialViewField = new MapViewType();
-        }
-        
         public MapViewType InitialView {
             get {
                 return this.initialViewField;
@@ -675,7 +654,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -901,7 +880,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1124,7 +1103,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1360,7 +1339,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InvokeURLCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BasicCommandType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1682,7 +1661,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum TargetViewerType {
         
@@ -1707,7 +1686,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BufferCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InvokeURLCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchCommandType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1888,7 +1867,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2090,7 +2069,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2102,13 +2081,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// PrintCommandType class constructor
-        /// </summary>
-        public PrintCommandType() {
-            this.printLayoutField = new BindingList<ResourceReferenceType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("PrintLayout")]
         public BindingList<ResourceReferenceType> PrintLayout {
             get {
@@ -2301,7 +2273,7 @@
     }
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(MapType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2511,7 +2483,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BufferCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InvokeURLCommandType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchCommandType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2728,7 +2700,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum TargetType {
         
@@ -2742,7 +2714,7 @@
         SpecifiedFrame,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -2944,7 +2916,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3125,7 +3097,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3306,7 +3278,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3487,7 +3459,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3668,7 +3640,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3849,7 +3821,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -3870,14 +3842,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// InvokeURLCommandType class constructor
-        /// </summary>
-        public InvokeURLCommandType() {
-            this.additionalParameterField = new BindingList<ParameterPairType>();
-            this.layerSetField = new BindingList<string>();
-        }
-        
         public string URL {
             get {
                 return this.uRLField;
@@ -4118,7 +4082,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4142,13 +4106,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// SearchCommandType class constructor
-        /// </summary>
-        public SearchCommandType() {
-            this.resultColumnsField = new BindingList<ResultColumnType>();
-        }
-        
         public string Layer {
             get {
                 return this.layerField;
@@ -4413,7 +4370,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4609,7 +4566,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum BasicCommandActionType {
         
@@ -4680,7 +4637,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(CommandItemType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(SeparatorItemType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(FlyoutItemType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -4876,7 +4833,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     public enum UIItemFunctionType {
         
@@ -4890,7 +4847,7 @@
         Flyout,
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5092,7 +5049,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5273,7 +5230,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5300,13 +5257,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// FlyoutItemType class constructor
-        /// </summary>
-        public FlyoutItemType() {
-            this.subItemField = new BindingList<UIItemType>();
-        }
-        
         public string Label {
             get {
                 return this.labelField;
@@ -5588,7 +5538,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -5882,7 +5832,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(WebLayoutResizableControlType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TaskPaneType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InformationPaneType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6078,7 +6028,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6259,7 +6209,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6440,7 +6390,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6452,13 +6402,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ContextMenuType class constructor
-        /// </summary>
-        public ContextMenuType() {
-            this.menuItemField = new BindingList<UIItemType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("MenuItem")]
         public BindingList<UIItemType> MenuItem {
             get {
@@ -6650,7 +6593,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6662,13 +6605,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ToolBarType class constructor
-        /// </summary>
-        public ToolBarType() {
-            this.buttonField = new BindingList<UIItemType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Button")]
         public BindingList<UIItemType> Button {
             get {
@@ -6860,7 +6796,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -6884,17 +6820,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// TaskBarType class constructor
-        /// </summary>
-        public TaskBarType() {
-            this.menuButtonField = new BindingList<UIItemType>();
-            this.tasksField = new TaskButtonType();
-            this.backField = new TaskButtonType();
-            this.forwardField = new TaskButtonType();
-            this.homeField = new TaskButtonType();
-        }
-        
         public TaskButtonType Home {
             get {
                 return this.homeField;
@@ -7160,7 +7085,7 @@
     
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(TaskPaneType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(InformationPaneType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7356,7 +7281,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7371,13 +7296,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// TaskPaneType class constructor
-        /// </summary>
-        public TaskPaneType() {
-            this.taskBarField = new TaskBarType();
-        }
-        
         public TaskBarType TaskBar {
             get {
                 return this.taskBarField;
@@ -7586,7 +7504,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7797,7 +7715,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -7809,13 +7727,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// CommandSetType class constructor
-        /// </summary>
-        public CommandSetType() {
-            this.commandField = new BindingList<CommandType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Command")]
         public BindingList<CommandType> Command {
             get {
@@ -8007,7 +7918,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8019,13 +7930,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// LayerSetType class constructor
-        /// </summary>
-        public LayerSetType() {
-            this.layerField = new BindingList<string>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Layer")]
         public BindingList<string> Layer {
             get {
@@ -8217,7 +8121,7 @@
         #endregion
     }
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -8229,13 +8133,6 @@
         
         private static System.Xml.Serialization.XmlSerializer serializer;
         
-        /// <summary>
-        /// ResultColumnSetType class constructor
-        /// </summary>
-        public ResultColumnSetType() {
-            this.columnField = new BindingList<ResultColumnType>();
-        }
-        
         [System.Xml.Serialization.XmlElementAttribute("Column")]
         public BindingList<ResultColumnType> Column {
             get {

Added: sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.Designer.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,37 @@
+namespace Maestro.Base.Editor
+{
+    partial class FeatureSourceEditor
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        }
+
+        #endregion
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/FeatureSourceEditor.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,42 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Base.Editor
+{
+    public partial class FeatureSourceEditor : EditorContentBase
+    {
+        public FeatureSourceEditor()
+        {
+            InitializeComponent();
+        }
+
+        protected override void Bind(Maestro.Editors.IEditorService service)
+        {
+            
+        }
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.Designer.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,45 @@
+namespace Maestro.Base.Editor
+{
+    partial class LayerDefinitionEditor
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.SuspendLayout();
+            // 
+            // LayerDefinitionEditor
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "LayerDefinitionEditor";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,93 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System.Diagnostics;
+using Maestro.Editors.LayerDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using Maestro.Editors;
+using ICSharpCode.Core;
+
+namespace Maestro.Base.Editor
+{
+    public partial class LayerDefinitionEditor : EditorContentBase
+    {
+        public LayerDefinitionEditor()
+        {
+            InitializeComponent();
+        }
+
+        private LayerDefinition _res;
+        private IEditorService _edsvc;
+
+        protected override void Bind(Maestro.Editors.IEditorService service)
+        {
+            _edsvc = service;
+            _edsvc.BeforeSave += new CancelEventHandler(OnBeforeSave);
+            _res = service.GetEditedResource() as LayerDefinition;
+            Debug.Assert(_res != null);
+
+            var vl = _res.Item as VectorLayerDefinitionType;
+            var gl = _res.Item as GridLayerDefinitionType;
+            var dl = _res.Item as DrawingLayerDefinitionType;
+            if (vl != null)
+            {
+                var ed = new VectorLayerEditorCtrl();
+                service.RegisterCustomNotifier(ed);
+                ed.Bind(service);
+                ed.Dock = DockStyle.Fill;
+                panelBody.Controls.Add(ed);
+            }
+            //else if (gl != null)
+            //{
+            //}
+            //else if (dl != null)
+            //{
+            //}
+            else
+            {
+                throw new NotSupportedException("Could not determine the sub-layer type"); //LOCALIZE
+            }
+        }
+
+        void OnBeforeSave(object sender, CancelEventArgs e)
+        {
+            //We've been editing an in-memory model of the session copy
+            //so we need to save this model back to the session copy before Save()
+            //commits the changes back to the original resource
+            try
+            {
+                _edsvc.UpdateResourceContent(_res.Serialize());
+                e.Cancel = false;
+            }
+            catch (Exception ex)
+            {
+                MessageService.ShowError(ex);
+                e.Cancel = true;
+            }
+        }
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.resx
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.resx	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/LayerDefinitionEditor.resx	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

Added: sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.Designer.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,37 @@
+namespace Maestro.Base.Editor
+{
+    partial class LoadProcedureEditor
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        }
+
+        #endregion
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/LoadProcedureEditor.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,42 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Base.Editor
+{
+    public partial class LoadProcedureEditor : EditorContentBase
+    {
+        public LoadProcedureEditor()
+        {
+            InitializeComponent();
+        }
+
+        protected override void Bind(Maestro.Editors.IEditorService service)
+        {
+            
+        }
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.Designer.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,37 @@
+namespace Maestro.Base.Editor
+{
+    partial class MapDefinitionEditor
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        }
+
+        #endregion
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/MapDefinitionEditor.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,42 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Base.Editor
+{
+    public partial class MapDefinitionEditor : EditorContentBase
+    {
+        public MapDefinitionEditor()
+        {
+            InitializeComponent();
+        }
+
+        protected override void Bind(Maestro.Editors.IEditorService service)
+        {
+            
+        }
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,37 @@
+namespace Maestro.Base.Editor
+{
+    partial class PrintLayoutEditor
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        }
+
+        #endregion
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/PrintLayoutEditor.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,42 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Base.Editor
+{
+    public partial class PrintLayoutEditor : EditorContentBase
+    {
+        public PrintLayoutEditor()
+        {
+            InitializeComponent();
+        }
+
+        protected override void Bind(Maestro.Editors.IEditorService service)
+        {
+            
+        }
+    }
+}

Modified: sandbox/maestro-2.5/Maestro.Base/Editor/ResourceEditorService.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/ResourceEditorService.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/ResourceEditorService.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -139,7 +139,6 @@
         {
             if (!OnBeforeSave())
             {
-                //_conn.ResourceService.SaveResourceAs(_editCopy, this.ResourceID);
                 _conn.ResourceService.CopyResource(this.EditedResourceID, this.ResourceID, true);
 
                 this.IsDirty = false;
@@ -172,12 +171,6 @@
             }
         }
 
-
-        public OSGeo.MapGuide.ObjectModels.Common.ResourceDataList EnumerateResourceData()
-        {
-            return _conn.ResourceService.EnumerateResourceData(_editCopy.ResourceID);
-        }
-
         public void AddResourceData(string dataName, OSGeo.MapGuide.ObjectModels.Common.ResourceDataType type, System.IO.Stream stream)
         {
             _conn.ResourceService.SetResourceData(_editCopy.ResourceID, dataName, type, stream);
@@ -230,5 +223,15 @@
         }
 
         public event System.ComponentModel.CancelEventHandler BeforeSave;
+
+        public IFeatureService FeatureService
+        {
+            get { return _conn.FeatureService; }
+        }
+
+        public IResourceService ResourceService
+        {
+            get { return _conn.ResourceService; }
+        }
     }
 }

Added: sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.Designer.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,37 @@
+namespace Maestro.Base.Editor
+{
+    partial class SymbolDefinitionEditor
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+        }
+
+        #endregion
+    }
+}

Added: sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/SymbolDefinitionEditor.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,42 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Base.Editor
+{
+    public partial class SymbolDefinitionEditor : EditorContentBase
+    {
+        public SymbolDefinitionEditor()
+        {
+            InitializeComponent();
+        }
+
+        protected override void Bind(Maestro.Editors.IEditorService service)
+        {
+            
+        }
+    }
+}

Modified: sandbox/maestro-2.5/Maestro.Base/Editor/WebLayoutEditor.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Editor/WebLayoutEditor.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Base/Editor/WebLayoutEditor.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -33,5 +33,10 @@
         {
             InitializeComponent();
         }
+
+        protected override void Bind(Maestro.Editors.IEditorService service)
+        {
+            
+        }
     }
 }

Modified: sandbox/maestro-2.5/Maestro.Base/Maestro.Base.csproj
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Maestro.Base.csproj	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Base/Maestro.Base.csproj	2010-05-21 08:22:46 UTC (rev 4919)
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E2F468-5030-4DBA-968C-9620284AFAA1}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -64,6 +64,36 @@
     <Compile Include="Commands\Toggle\ToggleMessagesCommand.cs" />
     <Compile Include="Commands\ValidateResourceCommand.cs" />
     <Compile Include="Commands\XmlEditCommand.cs" />
+    <Compile Include="Editor\FeatureSourceEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Editor\FeatureSourceEditor.Designer.cs">
+      <DependentUpon>FeatureSourceEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editor\LayerDefinitionEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Editor\LayerDefinitionEditor.Designer.cs">
+      <DependentUpon>LayerDefinitionEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editor\LoadProcedureEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Editor\LoadProcedureEditor.Designer.cs">
+      <DependentUpon>LoadProcedureEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editor\MapDefinitionEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Editor\MapDefinitionEditor.Designer.cs">
+      <DependentUpon>MapDefinitionEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editor\PrintLayoutEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Editor\PrintLayoutEditor.Designer.cs">
+      <DependentUpon>PrintLayoutEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="Editor\ResourceEditorService.cs" />
     <Compile Include="Editor\EditorContentBase.cs">
       <SubType>UserControl</SubType>
@@ -72,6 +102,12 @@
       <DependentUpon>EditorContentBase.cs</DependentUpon>
     </Compile>
     <Compile Include="Editor\IEditorViewContent.cs" />
+    <Compile Include="Editor\SymbolDefinitionEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Editor\SymbolDefinitionEditor.Designer.cs">
+      <DependentUpon>SymbolDefinitionEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="Editor\WebLayoutEditor.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -212,6 +248,9 @@
       <DependentUpon>EditorContentBase.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Editor\LayerDefinitionEditor.resx">
+      <DependentUpon>LayerDefinitionEditor.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Editor\WebLayoutEditor.resx">
       <DependentUpon>WebLayoutEditor.cs</DependentUpon>
       <SubType>Designer</SubType>

Modified: sandbox/maestro-2.5/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/Services/OpenResourceManager.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Base/Services/OpenResourceManager.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -39,7 +39,16 @@
             LoggingService.Info(Properties.Resources.Service_Init_Open_Resource_Manager);
         }
 
-        public void Open(RepositoryItem item, IServerConnection conn)
+        /// <summary>
+        /// Opens the specified resource using its assigned editor. If the resource is already
+        /// open, the the existing editor view is activated instead. If the resource has no assigned
+        /// editor or <see cref="useXmlEditor"/> is true, the resource will be opened in the default
+        /// XML editor.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="conn"></param>
+        /// <param name="useXmlEditor"></param>
+        public void Open(RepositoryItem item, IServerConnection conn, bool useXmlEditor)
         {
             if (item.IsFolder)
                 return;
@@ -58,7 +67,15 @@
                     return;
                 }
 
-                var ed = svc.OpenContent<XmlEditor>(ViewRegion.Document);
+                IEditorViewContent ed = null;
+                if (useXmlEditor || !res.IsStronglyTyped)
+                {
+                    ed = svc.OpenContent<XmlEditor>(ViewRegion.Document);
+                }
+                else
+                {
+                    ed = FindEditor(svc, res.GetResourceTypeDescriptor());
+                }
                 var launcher = ServiceRegistry.GetService<UrlLauncher>();
                 var editorSvc = new ResourceEditorService(item.ResourceId, conn, launcher);
                 ed.EditorService = editorSvc;
@@ -71,12 +88,66 @@
             _openItems[item.ResourceId].Activate();
         }
 
+        private IEditorViewContent FindEditor(ViewContentManager svc, ResourceTypeDescriptor rtd)
+        {
+            IEditorViewContent ed = null;
+            //TODO: Editors should be registered in the addin registry and we should be 
+            //interrogate from that.
+            Version rv = new Version(rtd.Version);
+            if (rv > new Version(1, 0, 0))
+            {
+                ed = svc.OpenContent<XmlEditor>(ViewRegion.Document);
+            }
+            else //Is a 1.0.0 resource
+            {
+                ResourceTypes rt = (ResourceTypes)Enum.Parse(typeof(ResourceTypes), rtd.ResourceType);
+                switch (rt)
+                {
+                    case ResourceTypes.ApplicationDefinition:
+                        break;
+                    case ResourceTypes.DrawingSource:
+                        break;
+                    case ResourceTypes.FeatureSource:
+                        ed = svc.OpenContent<FeatureSourceEditor>(ViewRegion.Document);
+                        break;
+                    case ResourceTypes.LayerDefinition:
+                        ed = svc.OpenContent<LayerDefinitionEditor>(ViewRegion.Document);
+                        break;
+                    case ResourceTypes.LoadProcedure:
+                        ed = svc.OpenContent<LoadProcedureEditor>(ViewRegion.Document);
+                        break;
+                    case ResourceTypes.MapDefinition:
+                        ed = svc.OpenContent<MapDefinitionEditor>(ViewRegion.Document);
+                        break;
+                    case ResourceTypes.PrintLayout:
+                        ed = svc.OpenContent<PrintLayoutEditor>(ViewRegion.Document);
+                        break;
+                    case ResourceTypes.SymbolDefinition:
+                        ed = svc.OpenContent<SymbolDefinitionEditor>(ViewRegion.Document);
+                        break;
+                    case ResourceTypes.SymbolLibrary:
+                        break;
+                    case ResourceTypes.WebLayout:
+                        ed = svc.OpenContent<WebLayoutEditor>(ViewRegion.Document);
+                        break;
+                    default:
+                        ed = svc.OpenContent<XmlEditor>(ViewRegion.Document);
+                        break;
+                }
+            }
+
+            if (ed == null)
+                ed = svc.OpenContent<XmlEditor>(ViewRegion.Document);
+
+            return ed;
+        }
+
         public void Open(RepositoryItem[] items, IServerConnection conn)
         {
             foreach (var item in items)
             {
                 if (!item.IsFolder)
-                    Open(item, conn);
+                    Open(item, conn, false);
             }
         }
     }

Modified: sandbox/maestro-2.5/Maestro.Base/UI/SiteExplorer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Base/UI/SiteExplorer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Base/UI/SiteExplorer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -100,7 +100,7 @@
                 if (item != null && !item.IsFolder)
                 {
                     var resMgr = ServiceRegistry.GetService<OpenResourceManager>();
-                    resMgr.Open(item, _conn);
+                    resMgr.Open(item, _conn, false);
                 }
             }
         }

Modified: sandbox/maestro-2.5/Maestro.Editors/Common/ResourceDataCtrl.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/Common/ResourceDataCtrl.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/Common/ResourceDataCtrl.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -82,7 +82,7 @@
 
         private void LoadResourceData()
         {
-            var list = _edSvc.EnumerateResourceData();
+            var list = _edSvc.ResourceService.EnumerateResourceData(_edSvc.EditedResourceID);
             _data = list.ResourceData;
 
             grdDataFiles.DataSource = _data;

Modified: sandbox/maestro-2.5/Maestro.Editors/EditorBase.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/EditorBase.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/EditorBase.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -25,7 +25,7 @@
 
 namespace Maestro.Editors
 {
-    public class EditorBase : UserControl 
+    public class EditorBase : UserControl, IEditorBindable
     {
         public virtual void Bind(IEditorService service)
         {

Added: sandbox/maestro-2.5/Maestro.Editors/IEditorBindable.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/IEditorBindable.cs	                        (rev 0)
+++ sandbox/maestro-2.5/Maestro.Editors/IEditorBindable.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,30 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Maestro.Editors
+{
+    public interface IEditorBindable : INotifyResourceChanged
+    {
+        void Bind(IEditorService service);
+    }
+}

Modified: sandbox/maestro-2.5/Maestro.Editors/IEditorService.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/IEditorService.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/IEditorService.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -26,6 +26,7 @@
 using System.IO;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System.ComponentModel;
+using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors
 {
@@ -35,6 +36,34 @@
     public interface IEditorService
     {
         /// <summary>
+        /// Gets the associated feature service
+        /// </summary>
+        IFeatureService FeatureService { get; }
+        /// <summary>
+        /// Gets the associated resource service
+        /// </summary>
+        IResourceService ResourceService { get; }
+        /// <summary>
+        /// Adds the specified resource data. Do not use the identical method exposed by the
+        /// <see cref="ResourceService"/> property as this one has dirty state notification hooks
+        /// </summary>
+        /// <param name="dataName"></param>
+        /// <param name="type"></param>
+        /// <param name="stream"></param>
+        void AddResourceData(string dataName, ResourceDataType type, Stream stream);
+        /// <summary>
+        /// Gets the specified resource data. 
+        /// </summary>
+        /// <param name="dataName"></param>
+        /// <returns></returns>
+        MemoryStream GetResourceData(string dataName);
+        /// <summary>
+        /// Removes the specified resource data. Do not use the identical method exposed by the
+        /// <see cref="ResourceService"/> property as this one has dirty state notification hooks
+        /// </summary>
+        /// <param name="dataName"></param>
+        void RemoveResourceData(string dataName);
+        /// <summary>
         /// Registers a custom notifier
         /// </summary>
         /// <param name="irc"></param>
@@ -62,39 +91,12 @@
         string SelectFolder();
 
         /// <summary>
-        /// Gets a list of this resource's data
-        /// </summary>
-        /// <returns></returns>
-        ResourceDataList EnumerateResourceData();
-
-        /// <summary>
         /// Updates the session copy's resource content
         /// </summary>
         /// <param name="xml"></param>
         void UpdateResourceContent(string xml);
 
         /// <summary>
-        /// Adds a new file to this resource's data
-        /// </summary>
-        /// <param name="dataName"></param>
-        /// <param name="type"></param>
-        /// <param name="stream"></param>
-        void AddResourceData(string dataName, ResourceDataType type, Stream stream);
-        
-        /// <summary>
-        /// Gets the stream for this resource's data
-        /// </summary>
-        /// <param name="dataName"></param>
-        /// <returns></returns>
-        MemoryStream GetResourceData(string dataName);
-
-        /// <summary>
-        /// Removes a datum from this resource's data
-        /// </summary>
-        /// <param name="dataName"></param>
-        void RemoveResourceData(string dataName);
-
-        /// <summary>
         /// Invokes a prompt to select a file from an unmanaged alias
         /// </summary>
         /// <param name="startPath"></param>

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.Designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -69,16 +69,18 @@
             this.btnCheckAll.Image = global::Maestro.Editors.Properties.Resources.tick;
             this.btnCheckAll.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btnCheckAll.Name = "btnCheckAll";
-            this.btnCheckAll.Size = new System.Drawing.Size(70, 22);
+            this.btnCheckAll.Size = new System.Drawing.Size(77, 22);
             this.btnCheckAll.Text = "Check All";
+            this.btnCheckAll.Click += new System.EventHandler(this.btnCheckAll_Click);
             // 
             // btnUncheckAll
             // 
             this.btnUncheckAll.Image = global::Maestro.Editors.Properties.Resources.cross;
             this.btnUncheckAll.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btnUncheckAll.Name = "btnUncheckAll";
-            this.btnUncheckAll.Size = new System.Drawing.Size(81, 22);
+            this.btnUncheckAll.Size = new System.Drawing.Size(90, 22);
             this.btnUncheckAll.Text = "Uncheck All";
+            this.btnUncheckAll.Click += new System.EventHandler(this.btnUncheckAll_Click);
             // 
             // btnInvert
             // 
@@ -88,6 +90,7 @@
             this.btnInvert.Size = new System.Drawing.Size(57, 22);
             this.btnInvert.Text = "Invert";
             this.btnInvert.ToolTipText = "Invert the checked/unchecked state of all properties";
+            this.btnInvert.Click += new System.EventHandler(this.btnInvert_Click);
             // 
             // toolStripSeparator1
             // 
@@ -124,19 +127,23 @@
             this.grdProperties.Dock = System.Windows.Forms.DockStyle.Fill;
             this.grdProperties.Location = new System.Drawing.Point(0, 25);
             this.grdProperties.Name = "grdProperties";
+            this.grdProperties.RowHeadersVisible = false;
             this.grdProperties.Size = new System.Drawing.Size(449, 267);
             this.grdProperties.TabIndex = 2;
+            this.grdProperties.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdProperties_CellEndEdit);
             // 
             // COL_VISIBLE
             // 
             this.COL_VISIBLE.HeaderText = "Visible";
             this.COL_VISIBLE.Name = "COL_VISIBLE";
+            this.COL_VISIBLE.Width = 50;
             // 
             // COL_NAME
             // 
             this.COL_NAME.HeaderText = "Name";
             this.COL_NAME.Name = "COL_NAME";
             this.COL_NAME.ReadOnly = true;
+            this.COL_NAME.Width = 130;
             // 
             // COL_DISPLAY
             // 
@@ -166,11 +173,11 @@
         private System.Windows.Forms.ToolStripButton btnUncheckAll;
         private System.Windows.Forms.ToolStripButton btnInvert;
         private System.Windows.Forms.DataGridView grdProperties;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripButton btnMoveUp;
+        private System.Windows.Forms.ToolStripButton btnMoveDown;
         private System.Windows.Forms.DataGridViewCheckBoxColumn COL_VISIBLE;
         private System.Windows.Forms.DataGridViewTextBoxColumn COL_NAME;
         private System.Windows.Forms.DataGridViewTextBoxColumn COL_DISPLAY;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripButton btnMoveUp;
-        private System.Windows.Forms.ToolStripButton btnMoveDown;
     }
 }

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -6,15 +6,159 @@
 using System.Text;
 using System.Windows.Forms;
 using Maestro.Shared.UI;
+using System.Diagnostics;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 
 namespace Maestro.Editors.LayerDefinition
 {
     [ToolboxItem(true)]
-    internal partial class LayerPropertiesSectionCtrl : CollapsiblePanel
+    internal partial class LayerPropertiesSectionCtrl : CollapsiblePanel, IEditorBindable
     {
         public LayerPropertiesSectionCtrl()
         {
             InitializeComponent();
         }
+
+        private IEditorService _edsvc;
+        private BindingList<NameStringPairType> _props;
+
+        public void Bind(IEditorService service)
+        {
+            _edsvc = service;
+
+            var res = service.GetEditedResource() as OSGeo.MapGuide.ObjectModels.LayerDefinition.LayerDefinition;
+            Debug.Assert(res != null);
+
+            var vl = res.Item as OSGeo.MapGuide.ObjectModels.LayerDefinition.VectorLayerDefinitionType;
+            Debug.Assert(vl != null);
+
+            _props = vl.PropertyMapping;
+            //Modifying the visibility constitutes a change in the resource
+            _props.ListChanged += (sender, e) => { OnResourceChanged(); };
+            PopulatePropertyList(vl);
+            vl.PropertyChanged += (sender, e) =>
+            {
+                if (e.PropertyName == "ResourceId") //Feature Source changed
+                {
+                    vl.PropertyMapping.Clear();
+                    PopulatePropertyList(vl);
+                }
+            };
+        }
+
+        private void PopulatePropertyList(VectorLayerDefinitionType vl)
+        {
+            var desc = _edsvc.FeatureService.DescribeFeatureSource(vl.ResourceId);
+            foreach (var sc in desc.Schemas)
+            {
+                if (sc.Fullname == vl.FeatureName)
+                {
+                    grdProperties.Rows.Clear();
+                    foreach (var col in sc.Columns)
+                    {
+                        if (!col.IsGeometry)
+                        {
+                            bool visible = false;
+                            string disp = col.Name;
+                            foreach (var item in vl.PropertyMapping)
+                            {
+                                if (item.Name == col.Name)
+                                {
+                                    visible = true;
+                                    disp = item.Value;
+                                }
+                            }
+                            grdProperties.Rows.Add(visible, col.Name, disp);
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+
+        private void OnResourceChanged()
+        {
+            var handler = this.ResourceChanged;
+            if (handler != null)
+                handler(this, EventArgs.Empty);
+        }
+
+        public event EventHandler ResourceChanged;
+
+        private void btnCheckAll_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow row in grdProperties.Rows)
+            {
+                if (!(bool)row.Cells[0].Value)
+                {
+                    row.Cells[0].Value = true;
+                    OnPropertyMappingChanged((bool)row.Cells[0].Value, row.Cells[1].Value.ToString(), row.Cells[2].Value.ToString());
+                }
+            }
+            grdProperties.Refresh();
+        }
+
+        private void btnUncheckAll_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow row in grdProperties.Rows)
+            {
+                if ((bool)row.Cells[0].Value)
+                {
+                    row.Cells[0].Value = false;
+                    OnPropertyMappingChanged((bool)row.Cells[0].Value, row.Cells[1].Value.ToString(), row.Cells[2].Value.ToString());
+                }
+            }
+            grdProperties.Refresh();
+        }
+
+        private void btnInvert_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow row in grdProperties.Rows)
+            {
+                row.Cells[0].Value = !((bool)row.Cells[0].Value); //Negate
+                OnPropertyMappingChanged((bool)row.Cells[0].Value, row.Cells[1].Value.ToString(), row.Cells[2].Value.ToString());
+            }
+            grdProperties.Refresh();
+        }
+
+        private void OnPropertyMappingChanged(bool state, string propertyName, string displayName)
+        {
+            NameStringPairType nsp = null;
+            foreach (var item in _props)
+            {
+                if (item.Name == propertyName)
+                {
+                    nsp = item;
+                    break;
+                }
+            }
+
+            if (state)
+            {
+                if (nsp == null)
+                {
+                    _props.Add(new NameStringPairType() { Name = propertyName, Value = displayName });
+                }
+            }
+            else //Turned off
+            {
+                if (nsp != null)
+                {
+                    _props.Remove(nsp);
+                }
+            }
+        }
+
+        private void grdProperties_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.RowIndex >= 0)
+            {
+                var row = grdProperties.Rows[e.RowIndex];
+                if (e.ColumnIndex == 0) //checkbox
+                {
+                    OnPropertyMappingChanged((bool)row.Cells[0].Value, row.Cells[1].Value.ToString(), row.Cells[2].Value.ToString());
+                }
+            }
+        }
     }
 }

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.resx
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.resx	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.resx	2010-05-21 08:22:46 UTC (rev 4919)
@@ -129,13 +129,4 @@
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="COL_VISIBLE.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="COL_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="COL_DISPLAY.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
\ No newline at end of file

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -37,15 +37,15 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.grpLayerSettings = new System.Windows.Forms.GroupBox();
+            this.btnEditTooltip = new System.Windows.Forms.Button();
+            this.btnEditHyperlink = new System.Windows.Forms.Button();
+            this.btnEditFilter = new System.Windows.Forms.Button();
+            this.txtTooltip = new System.Windows.Forms.TextBox();
+            this.txtHyperlink = new System.Windows.Forms.TextBox();
+            this.txtFilter = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.txtFilter = new System.Windows.Forms.TextBox();
-            this.txtHyperlink = new System.Windows.Forms.TextBox();
-            this.txtTooltip = new System.Windows.Forms.TextBox();
-            this.btnEditFilter = new System.Windows.Forms.Button();
-            this.btnEditHyperlink = new System.Windows.Forms.Button();
-            this.btnEditTooltip = new System.Windows.Forms.Button();
             this.contentPanel.SuspendLayout();
             this.grpFeatureClass.SuspendLayout();
             this.grpLayerSettings.SuspendLayout();
@@ -78,6 +78,7 @@
             this.txtFeatureSource.ReadOnly = true;
             this.txtFeatureSource.Size = new System.Drawing.Size(288, 20);
             this.txtFeatureSource.TabIndex = 1;
+            this.txtFeatureSource.TextChanged += new System.EventHandler(this.txtFeatureSource_TextChanged);
             // 
             // btnBrowseFeatureSource
             // 
@@ -88,6 +89,7 @@
             this.btnBrowseFeatureSource.TabIndex = 2;
             this.btnBrowseFeatureSource.Text = "...";
             this.btnBrowseFeatureSource.UseVisualStyleBackColor = true;
+            this.btnBrowseFeatureSource.Click += new System.EventHandler(this.btnBrowseFeatureSource_Click);
             // 
             // grpFeatureClass
             // 
@@ -125,6 +127,7 @@
             this.cmbSchema.Name = "cmbSchema";
             this.cmbSchema.Size = new System.Drawing.Size(286, 21);
             this.cmbSchema.TabIndex = 2;
+            this.cmbSchema.SelectedIndexChanged += new System.EventHandler(this.cmbSchema_SelectedIndexChanged);
             // 
             // label3
             // 
@@ -164,41 +167,44 @@
             this.grpLayerSettings.TabStop = false;
             this.grpLayerSettings.Text = "Layer Settings";
             // 
-            // label4
+            // btnEditTooltip
             // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(15, 22);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(29, 13);
-            this.label4.TabIndex = 0;
-            this.label4.Text = "Filter";
+            this.btnEditTooltip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnEditTooltip.Location = new System.Drawing.Point(377, 66);
+            this.btnEditTooltip.Name = "btnEditTooltip";
+            this.btnEditTooltip.Size = new System.Drawing.Size(30, 23);
+            this.btnEditTooltip.TabIndex = 8;
+            this.btnEditTooltip.Text = "...";
+            this.btnEditTooltip.UseVisualStyleBackColor = true;
             // 
-            // label5
+            // btnEditHyperlink
             // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(15, 47);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(51, 13);
-            this.label5.TabIndex = 1;
-            this.label5.Text = "Hyperlink";
+            this.btnEditHyperlink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnEditHyperlink.Location = new System.Drawing.Point(377, 42);
+            this.btnEditHyperlink.Name = "btnEditHyperlink";
+            this.btnEditHyperlink.Size = new System.Drawing.Size(30, 23);
+            this.btnEditHyperlink.TabIndex = 7;
+            this.btnEditHyperlink.Text = "...";
+            this.btnEditHyperlink.UseVisualStyleBackColor = true;
             // 
-            // label6
+            // btnEditFilter
             // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(15, 71);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(39, 13);
-            this.label6.TabIndex = 2;
-            this.label6.Text = "Tooltip";
+            this.btnEditFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnEditFilter.Location = new System.Drawing.Point(377, 17);
+            this.btnEditFilter.Name = "btnEditFilter";
+            this.btnEditFilter.Size = new System.Drawing.Size(30, 23);
+            this.btnEditFilter.TabIndex = 6;
+            this.btnEditFilter.Text = "...";
+            this.btnEditFilter.UseVisualStyleBackColor = true;
             // 
-            // txtFilter
+            // txtTooltip
             // 
-            this.txtFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            this.txtTooltip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                         | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtFilter.Location = new System.Drawing.Point(121, 19);
-            this.txtFilter.Name = "txtFilter";
-            this.txtFilter.Size = new System.Drawing.Size(250, 20);
-            this.txtFilter.TabIndex = 3;
+            this.txtTooltip.Location = new System.Drawing.Point(121, 68);
+            this.txtTooltip.Name = "txtTooltip";
+            this.txtTooltip.Size = new System.Drawing.Size(250, 20);
+            this.txtTooltip.TabIndex = 5;
             // 
             // txtHyperlink
             // 
@@ -209,51 +215,48 @@
             this.txtHyperlink.Size = new System.Drawing.Size(250, 20);
             this.txtHyperlink.TabIndex = 4;
             // 
-            // txtTooltip
+            // txtFilter
             // 
-            this.txtTooltip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            this.txtFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                         | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtTooltip.Location = new System.Drawing.Point(121, 68);
-            this.txtTooltip.Name = "txtTooltip";
-            this.txtTooltip.Size = new System.Drawing.Size(250, 20);
-            this.txtTooltip.TabIndex = 5;
+            this.txtFilter.Location = new System.Drawing.Point(121, 19);
+            this.txtFilter.Name = "txtFilter";
+            this.txtFilter.Size = new System.Drawing.Size(250, 20);
+            this.txtFilter.TabIndex = 3;
             // 
-            // btnEditFilter
+            // label6
             // 
-            this.btnEditFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnEditFilter.Location = new System.Drawing.Point(377, 17);
-            this.btnEditFilter.Name = "btnEditFilter";
-            this.btnEditFilter.Size = new System.Drawing.Size(30, 23);
-            this.btnEditFilter.TabIndex = 6;
-            this.btnEditFilter.Text = "...";
-            this.btnEditFilter.UseVisualStyleBackColor = true;
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(15, 71);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(39, 13);
+            this.label6.TabIndex = 2;
+            this.label6.Text = "Tooltip";
             // 
-            // btnEditHyperlink
+            // label5
             // 
-            this.btnEditHyperlink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnEditHyperlink.Location = new System.Drawing.Point(377, 42);
-            this.btnEditHyperlink.Name = "btnEditHyperlink";
-            this.btnEditHyperlink.Size = new System.Drawing.Size(30, 23);
-            this.btnEditHyperlink.TabIndex = 7;
-            this.btnEditHyperlink.Text = "...";
-            this.btnEditHyperlink.UseVisualStyleBackColor = true;
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(15, 47);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(51, 13);
+            this.label5.TabIndex = 1;
+            this.label5.Text = "Hyperlink";
             // 
-            // btnEditTooltip
+            // label4
             // 
-            this.btnEditTooltip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnEditTooltip.Location = new System.Drawing.Point(377, 66);
-            this.btnEditTooltip.Name = "btnEditTooltip";
-            this.btnEditTooltip.Size = new System.Drawing.Size(30, 23);
-            this.btnEditTooltip.TabIndex = 8;
-            this.btnEditTooltip.Text = "...";
-            this.btnEditTooltip.UseVisualStyleBackColor = true;
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(15, 22);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(29, 13);
+            this.label4.TabIndex = 0;
+            this.label4.Text = "Filter";
             // 
-            // ResourceSettingsSectionCtrl
+            // VectorLayerSettingsSectionCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.HeaderText = "Resource Settings";
-            this.Name = "ResourceSettingsSectionCtrl";
+            this.Name = "VectorLayerSettingsSectionCtrl";
             this.Size = new System.Drawing.Size(449, 267);
             this.contentPanel.ResumeLayout(false);
             this.contentPanel.PerformLayout();

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -25,15 +25,93 @@
 using System.Text;
 using System.Windows.Forms;
 using Maestro.Shared.UI;
+using System.Diagnostics;
+using OSGeo.MapGuide.MaestroAPI;
+using Maestro.Editors.Generic;
 
 namespace Maestro.Editors.LayerDefinition.Vector
 {
     [ToolboxItem(true)]
-    internal partial class VectorLayerSettingsSectionCtrl : CollapsiblePanel
+    internal partial class VectorLayerSettingsSectionCtrl : CollapsiblePanel, IEditorBindable
     {
         public VectorLayerSettingsSectionCtrl()
         {
             InitializeComponent();
         }
+
+        private IEditorService _edsvc;
+
+        public void Bind(IEditorService service)
+        {
+            _edsvc = service;
+
+            var res = service.GetEditedResource() as OSGeo.MapGuide.ObjectModels.LayerDefinition.LayerDefinition;
+            Debug.Assert(res != null);
+
+            var vl = res.Item as OSGeo.MapGuide.ObjectModels.LayerDefinition.VectorLayerDefinitionType;
+            Debug.Assert(vl != null);
+
+            txtFeatureSource.DataBindings.Add("Text", vl, "ResourceId");
+            cmbSchema.DataBindings.Add("Text", vl, "FeatureName");
+            cmbGeometry.DataBindings.Add("Text", vl, "Geometry");
+            txtFilter.DataBindings.Add("Text", vl, "Filter");
+            txtHyperlink.DataBindings.Add("Text", vl, "Url");
+            txtTooltip.DataBindings.Add("Text", vl, "ToolTip");
+
+            vl.PropertyChanged += (sender, e) => { OnResourceChanged(); };
+        }
+
+        private void OnResourceChanged()
+        {
+            var handler = this.ResourceChanged;
+            if (handler != null)
+                handler(this, EventArgs.Empty);
+        }
+
+        public event EventHandler ResourceChanged;
+
+        private FeatureSourceDescription _cachedDesc;
+
+        private void txtFeatureSource_TextChanged(object sender, EventArgs e)
+        {
+            _cachedDesc = _edsvc.FeatureService.DescribeFeatureSource(txtFeatureSource.Text);
+            List<string> schemas = new List<string>();
+            foreach (var sc in _cachedDesc.Schemas)
+            {
+                schemas.Add(sc.Fullname);
+            }
+            cmbSchema.DataSource = schemas;
+        }
+
+        private void cmbSchema_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cmbSchema.SelectedItem != null)
+            {
+                var name = cmbSchema.SelectedItem.ToString();
+                foreach (var sc in _cachedDesc.Schemas)
+                {
+                    if (name == sc.Fullname)
+                    {
+                        List<string> geoms = new List<string>();
+                        foreach (var col in sc.Columns)
+                        {
+                            if (col.IsGeometry)
+                                geoms.Add(col.Name);
+                        }
+                        cmbGeometry.DataSource = geoms;
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void btnBrowseFeatureSource_Click(object sender, EventArgs e)
+        {
+            var picker = new ResourcePicker(_edsvc.ResourceService, ResourceTypes.FeatureSource);
+            if (picker.ShowDialog() == DialogResult.OK)
+            {
+                txtFeatureSource.Text = picker.ResourceID;
+            }
+        }
     }
 }

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -29,11 +29,18 @@
 namespace Maestro.Editors.LayerDefinition.Vector
 {
     [ToolboxItem(true)]
-    internal partial class VectorLayerStyleSectionCtrl : CollapsiblePanel
+    internal partial class VectorLayerStyleSectionCtrl : CollapsiblePanel, IEditorBindable
     {
         public VectorLayerStyleSectionCtrl()
         {
             InitializeComponent();
         }
+
+        public void Bind(IEditorService service)
+        {
+            throw new NotImplementedException();
+        }
+
+        public event EventHandler ResourceChanged;
     }
 }

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -28,65 +28,65 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.vectorLayerSettingsSectionCtrl1 = new Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl();
-            this.layerPropertiesSectionCtrl1 = new Maestro.Editors.LayerDefinition.LayerPropertiesSectionCtrl();
-            this.vectorLayerStyleSectionCtrl1 = new Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl();
+            this.resSettings = new Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl();
+            this.layerProperties = new Maestro.Editors.LayerDefinition.LayerPropertiesSectionCtrl();
+            this.layerStyles = new Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl();
             this.SuspendLayout();
             // 
-            // vectorLayerSettingsSectionCtrl1
+            // resSettings
             // 
-            this.vectorLayerSettingsSectionCtrl1.ContentBackgroundColor = System.Drawing.SystemColors.Control;
-            this.vectorLayerSettingsSectionCtrl1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.vectorLayerSettingsSectionCtrl1.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
-            this.vectorLayerSettingsSectionCtrl1.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.vectorLayerSettingsSectionCtrl1.HeaderText = "Resource Settings";
-            this.vectorLayerSettingsSectionCtrl1.Location = new System.Drawing.Point(0, 0);
-            this.vectorLayerSettingsSectionCtrl1.Name = "vectorLayerSettingsSectionCtrl1";
-            this.vectorLayerSettingsSectionCtrl1.Size = new System.Drawing.Size(704, 267);
-            this.vectorLayerSettingsSectionCtrl1.TabIndex = 0;
+            this.resSettings.ContentBackgroundColor = System.Drawing.SystemColors.Control;
+            this.resSettings.Dock = System.Windows.Forms.DockStyle.Top;
+            this.resSettings.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
+            this.resSettings.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.resSettings.HeaderText = "Resource Settings";
+            this.resSettings.Location = new System.Drawing.Point(0, 0);
+            this.resSettings.Name = "resSettings";
+            this.resSettings.Size = new System.Drawing.Size(687, 267);
+            this.resSettings.TabIndex = 0;
             // 
-            // layerPropertiesSectionCtrl1
+            // layerProperties
             // 
-            this.layerPropertiesSectionCtrl1.ContentBackgroundColor = System.Drawing.SystemColors.Control;
-            this.layerPropertiesSectionCtrl1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.layerPropertiesSectionCtrl1.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
-            this.layerPropertiesSectionCtrl1.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.layerPropertiesSectionCtrl1.HeaderText = "Layer Properties Visible in Viewer";
-            this.layerPropertiesSectionCtrl1.Location = new System.Drawing.Point(0, 267);
-            this.layerPropertiesSectionCtrl1.Name = "layerPropertiesSectionCtrl1";
-            this.layerPropertiesSectionCtrl1.Size = new System.Drawing.Size(704, 235);
-            this.layerPropertiesSectionCtrl1.TabIndex = 1;
+            this.layerProperties.ContentBackgroundColor = System.Drawing.SystemColors.Control;
+            this.layerProperties.Dock = System.Windows.Forms.DockStyle.Top;
+            this.layerProperties.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
+            this.layerProperties.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.layerProperties.HeaderText = "Layer Properties Visible in Viewer";
+            this.layerProperties.Location = new System.Drawing.Point(0, 267);
+            this.layerProperties.Name = "layerProperties";
+            this.layerProperties.Size = new System.Drawing.Size(687, 235);
+            this.layerProperties.TabIndex = 1;
             // 
-            // vectorLayerStyleSectionCtrl1
+            // layerStyles
             // 
-            this.vectorLayerStyleSectionCtrl1.ContentBackgroundColor = System.Drawing.SystemColors.Control;
-            this.vectorLayerStyleSectionCtrl1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.vectorLayerStyleSectionCtrl1.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
-            this.vectorLayerStyleSectionCtrl1.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.vectorLayerStyleSectionCtrl1.HeaderText = "Layer Styles";
-            this.vectorLayerStyleSectionCtrl1.Location = new System.Drawing.Point(0, 502);
-            this.vectorLayerStyleSectionCtrl1.Name = "vectorLayerStyleSectionCtrl1";
-            this.vectorLayerStyleSectionCtrl1.Size = new System.Drawing.Size(704, 319);
-            this.vectorLayerStyleSectionCtrl1.TabIndex = 2;
+            this.layerStyles.ContentBackgroundColor = System.Drawing.SystemColors.Control;
+            this.layerStyles.Dock = System.Windows.Forms.DockStyle.Top;
+            this.layerStyles.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
+            this.layerStyles.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.layerStyles.HeaderText = "Layer Styles";
+            this.layerStyles.Location = new System.Drawing.Point(0, 502);
+            this.layerStyles.Name = "layerStyles";
+            this.layerStyles.Size = new System.Drawing.Size(687, 319);
+            this.layerStyles.TabIndex = 2;
             // 
             // VectorLayerEditorCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScroll = true;
-            this.Controls.Add(this.vectorLayerStyleSectionCtrl1);
-            this.Controls.Add(this.layerPropertiesSectionCtrl1);
-            this.Controls.Add(this.vectorLayerSettingsSectionCtrl1);
+            this.Controls.Add(this.layerStyles);
+            this.Controls.Add(this.layerProperties);
+            this.Controls.Add(this.resSettings);
             this.Name = "VectorLayerEditorCtrl";
-            this.Size = new System.Drawing.Size(704, 530);
+            this.Size = new System.Drawing.Size(687, 530);
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl vectorLayerSettingsSectionCtrl1;
-        private LayerPropertiesSectionCtrl layerPropertiesSectionCtrl1;
-        private Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl vectorLayerStyleSectionCtrl1;
+        private Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl resSettings;
+        private LayerPropertiesSectionCtrl layerProperties;
+        private Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl layerStyles;
     }
 }

Modified: sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -8,11 +8,19 @@
 
 namespace Maestro.Editors.LayerDefinition
 {
-    public partial class VectorLayerEditorCtrl : UserControl
+    public partial class VectorLayerEditorCtrl : EditorBase
     {
         public VectorLayerEditorCtrl()
         {
             InitializeComponent();
         }
+
+        public override void Bind(IEditorService service)
+        {
+            resSettings.ResourceChanged += (sender, e) => { OnResourceChanged(); };
+            resSettings.Bind(service);
+            layerProperties.ResourceChanged += (sender, e) => { OnResourceChanged(); };
+            layerProperties.Bind(service);
+        }
     }
 }

Modified: sandbox/maestro-2.5/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- sandbox/maestro-2.5/Maestro.Editors/Maestro.Editors.csproj	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/Maestro.Editors/Maestro.Editors.csproj	2010-05-21 08:22:46 UTC (rev 4919)
@@ -194,6 +194,7 @@
     <Compile Include="Generic\XmlValidationResult.Designer.cs">
       <DependentUpon>XmlValidationResult.cs</DependentUpon>
     </Compile>
+    <Compile Include="IEditorBindable.cs" />
     <Compile Include="IEditorService.cs" />
     <Compile Include="LayerDefinition\LayerPropertiesSectionCtrl.cs">
       <SubType>UserControl</SubType>

Modified: sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/Feature/FeatureSetReader.cs
===================================================================
--- sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/Feature/FeatureSetReader.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/Feature/FeatureSetReader.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -277,6 +277,14 @@
 
 		public string Name { get { return m_name; } }
 		public Type Type { get { return m_type; } }
+
+        public bool IsGeometry
+        {
+            get
+            {
+                return typeof(IGeometry).IsAssignableFrom(this.Type);
+            }
+        }
 	}
 
 	public abstract class FeatureSetRow : IDataRecord

Modified: sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj	2010-05-21 08:22:46 UTC (rev 4919)
@@ -194,6 +194,7 @@
     <Compile Include="ObjectModels\LayerDefinition.cs" />
     <Compile Include="ObjectModels\LoadProcedure.cs" />
     <Compile Include="ObjectModels\MapDefinition.cs" />
+    <Compile Include="ObjectModels\ObjectFactory.cs" />
     <Compile Include="ObjectModels\PrintLayout.cs" />
     <Compile Include="ObjectModels\ResourceItems.cs" />
     <Compile Include="ObjectModels\SymbolDefinition.cs" />

Modified: sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
===================================================================
--- sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -96,12 +96,4 @@
             get { return true; }
         }
     }
-
-    partial class NameValuePairType
-    {
-        public bool ShouldSerializeExtendedData()
-        {
-            return extendedData1Field != null && extendedData1Field.Any.Length > 0;
-        }
-    }
 }

Added: sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
===================================================================
--- sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs	                        (rev 0)
+++ sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs	2010-05-21 08:22:46 UTC (rev 4919)
@@ -0,0 +1,33 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+// 
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OSGeo.MapGuide.MaestroAPI.ObjectModels
+{
+    /// <summary>
+    /// Factory class to create MapGuide resource objects
+    /// </summary>
+    public static class ObjectFactory
+    {
+        
+    }
+}

Modified: sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/readme.txt
===================================================================
--- sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/readme.txt	2010-05-21 07:18:48 UTC (rev 4918)
+++ sandbox/maestro-2.5/OSGeo.MapGuide.MaestroAPI/ObjectModels/readme.txt	2010-05-21 08:22:46 UTC (rev 4919)
@@ -1,5 +1,7 @@
 Running generate.bat will cause redundant generation of the following classes:
 
+MapDefinition will have an invalid initialization statemtent on the BackgroundColor property. Simply remove it.
+
 Also any schemas with ExtendedData elements will have to be changed. Anything attributed 
 with XmlAnyElementAttribute is usually a BindingList<T> (the default list I've chosen for 
 generating classes). BindingList<T> is not compatible for XML serialization, so these have



More information about the mapguide-commits mailing list