* Binding.cs, Import.cs, Message.cs, MessageBinding.cs, MessagePart.cs,

	  Operation.cs, OperationBinding.cs, OperationMessage.cs, Port.cs,
	  PortType.cs, Service.cs: Added XmlIgnore attributes to properties
	  referencing parent objects.
	* OperationMessageCollection.cs: Fixed wrong OnInsert method
	* ServiceDescription.cs: Removed unneeded methods in
	  ServiceDescriptionSerializer.

svn path=/trunk/mcs/; revision=16521

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs
index 9b7206f596e3fcc0deef641fff62e40dbf197d41..12cdf0cfbbb8fbfc0a121da6175f44b456459097 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs
@@ -56,6 +56,7 @@ namespace System.Web.Services.Description {
                        get { return operations; }\r
                }\r
 \r
+               [XmlIgnore]\r
                public ServiceDescription ServiceDescription {\r
                        get { return serviceDescription; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
index 779d19a55c901a7b7503f90895c916831202e899..8400b285230fbda3bab85b26cd94702b0e6254bb 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-22  Lluis Sanchez Gual  <lluis@ximian.com>
+
+       * Binding.cs, Import.cs, Message.cs, MessageBinding.cs, MessagePart.cs,
+         Operation.cs, OperationBinding.cs, OperationMessage.cs, Port.cs, 
+         PortType.cs, Service.cs: Added XmlIgnore attributes to properties
+         referencing parent objects.
+       * OperationMessageCollection.cs: Fixed wrong OnInsert method
+       * ServiceDescription.cs: Removed unneeded methods in 
+         ServiceDescriptionSerializer.
+
 2002-08-20  Tim Coleman <tim@timcoleman.com>
        * ServiceDescription.cs:
                Add ServiceDescription.ServiceDescriptionSerializer

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs
index 8c36325bf197a00bfad9d6a78f9947fe9c3e7273..b50abaa961cf60293ca0c92669019022a929573c 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs
@@ -45,6 +45,7 @@ namespace System.Web.Services.Description {
                        set { ns = value; }\r
                }\r
        \r
+               [XmlIgnore]\r
                public ServiceDescription ServiceDescription {\r
                        get { return serviceDescription; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs
index 3d812ee2c8d4b37c68e4e848ac90bac965ae3130..3f933f938502707f46f49e429c0be12127ed0d9f 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs
@@ -46,6 +46,7 @@ namespace System.Web.Services.Description {
                        get { return parts; }\r
                }\r
 \r
+               [XmlIgnore]\r
                public ServiceDescription ServiceDescription {\r
                        get { return serviceDescription; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs
index 6488901d9ff57c65dbf30177a10cb26c8778713b..bc545784661cc3d45638ad6ed8fab34b2cefd265 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs
@@ -42,6 +42,7 @@ namespace System.Web.Services.Description {
                        set { name = value; }\r
                }\r
        \r
+               [XmlIgnore]\r
                public OperationBinding OperationBinding {\r
                        get { return operationBinding; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs
index 8b6923807f3ed01464f3a7809f43a78cf6a3963a..5116d06630034d3497d6b5cc1cba023dfead9337 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs
@@ -42,6 +42,7 @@ namespace System.Web.Services.Description {
                        set { element = value; }\r
                }\r
                \r
+               [XmlIgnore]\r
                public Message Message {\r
                        get { return message; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs
index 2823503f126eb95262ed9e21e871e33be0956d84..675d29ab26cf6d1a5f01f53cd504f24a6083dcd2 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs
@@ -73,6 +73,7 @@ namespace System.Web.Services.Description {
                        set { ParameterOrder = value.Split (' '); }\r
                }\r
 \r
+               [XmlIgnore]\r
                public PortType PortType {\r
                        get { return portType; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs
index 0bdb5e9579a668faf5ef4833e03db9ca7ef6d8fa..0c6c746f078fa03b0bd2d4c1804210eb763ab679 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs
@@ -40,6 +40,7 @@ namespace System.Web.Services.Description {
 \r
                #region Properties\r
        \r
+               [XmlIgnore]\r
                public Binding Binding {\r
                        get { return binding; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs
index e24f045131abc786e393c610456b454a1bb57860..78d2923770c088fc97ad488a446282ed889f139d 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs
@@ -47,6 +47,7 @@ namespace System.Web.Services.Description {
                        set { name = value; }\r
                }\r
 \r
+               [XmlIgnore]\r
                public Operation Operation {\r
                        get { return operation; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessageCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessageCollection.cs
index 86aefe85c2e96aa1ea20e4d09dbded1ec0c17425..117f968e5a8188e451cef193a654cc4796f0ab80 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessageCollection.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessageCollection.cs
@@ -96,7 +96,7 @@ namespace System.Web.Services.Description {
 \r
                protected override void OnInsert (int index, object value)\r
                {\r
-                       if (Count > 2 || value.GetType () == this [0].GetType ())\r
+                       if (Count > 2 || (Count > 1 && value.GetType () == this [0].GetType ()))\r
                                throw new InvalidOperationException ("The operation object can only contain one input and one output message.");\r
                }\r
 \r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs
index cdd86d9885e28f16c1ed81bb7720497638300c47..f297facb749ef5ee9a37736884ef912319d75239 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs
@@ -55,6 +55,7 @@ namespace System.Web.Services.Description {
                        set { name = value; }\r
                }\r
        \r
+               [XmlIgnore]\r
                public Service Service {\r
                        get { return service; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs
index c5f9205484cf22df8f0b0fa955439a7f70c738e9..f2d47d01323515b9de6329fbc4fa9a70d6c91c03 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs
@@ -44,6 +44,7 @@ namespace System.Web.Services.Description {
                        get { return operations; }\r
                }\r
        \r
+               [XmlIgnore]\r
                public ServiceDescription ServiceDescription {\r
                        get { return serviceDescription; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs
index a214bd0531aacc04754858c9f068edf29108fcb0..53fd9c6178873f3af24850f9b9935467544e97c8 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs
@@ -51,6 +51,7 @@ namespace System.Web.Services.Description {
                        get { return ports; }\r
                }\r
 \r
+               [XmlIgnore]\r
                public ServiceDescription ServiceDescription {\r
                        get { return serviceDescription; }\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
index 737324c5acd58875d3b6e4350a601fab93f55258..ee32d2c1b0cd3385574b2ef8210ba242396e26b7 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
@@ -224,35 +224,6 @@ namespace System.Web.Services.Description {
 \r
                        #region Methods\r
 \r
-                       [MonoTODO]\r
-                       public override bool CanDeserialize (XmlReader reader)\r
-                       {\r
-                               throw new NotImplementedException ();\r
-                       }\r
-\r
-                       [MonoTODO]\r
-                       protected override XmlSerializationReader CreateReader ()\r
-                       {\r
-                               throw new NotImplementedException ();\r
-                       }\r
-\r
-                       [MonoTODO]\r
-                       protected override XmlSerializationWriter CreateWriter ()\r
-                       {\r
-                               throw new NotImplementedException ();\r
-                       }\r
-                       \r
-                       [MonoTODO]\r
-                       protected override object Deserialize (XmlSerializationReader reader)\r
-                       {\r
-                               throw new NotImplementedException ();\r
-                       }\r
-\r
-                       [MonoTODO]\r
-                       protected override void Serialize (object serviceDescription, XmlSerializationWriter writer)\r
-                       {\r
-                               throw new NotImplementedException ();\r
-                       }\r
 \r
                        #endregion // Methods\r
                }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtension.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtension.cs
index e8d51b50b67d5e3a33cf65f65a5c3ace9127d821..b859577464f3879f8e60ca266fe2630aa1d10920 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtension.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtension.cs
@@ -40,6 +40,7 @@ namespace System.Web.Services.Description {
                        set { handled = value; }\r
                }\r
 \r
+               [XmlIgnore]\r
                public object Parent {\r
                        get { return parent; }\r
                }\r