* OperationMessage.cs (Extensions): Remove, incorrectly added in earlier

commit.
* OperationInput.cs (Extensions):
* OperationOutput.cs (Extensions):
* OperationFault.cs (Extensions): Override and implement missing property.

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

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 d9fdc01321222f9cbd6c62bfa6aefd07ae10baba..13dbb09791eb44a3a836717b7a6f1b56c0cf20f1 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,11 @@
+2006-04-27  Ankit Jain  <jankit@novell.com>
+
+       * OperationMessage.cs (Extensions): Remove, incorrectly added in earlier
+       commit.
+       * OperationInput.cs (Extensions):
+       * OperationOutput.cs (Extensions):
+       * OperationFault.cs (Extensions): Override and implement missing property.
+
 2006-04-27  Ankit Jain  <jankit@novell.com>
 
        * ServiceDescriptionSerializerBase.cs (ServiceDescriptionWriterBase):

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs
index e6e8f5e5c67baf7e476350a4fd8c2ab40db4200c..c09ddb657ad25b70b397bb228bee497edaed2b90 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs
@@ -3,8 +3,10 @@
 //\r
 // Author:\r
 //   Tim Coleman (tim@timcoleman.com)\r
+//   Ankit Jain (jankit@novell.com)
 //\r
 // Copyright (C) Tim Coleman, 2002\r
+// Copyright (C) 2006 Novell, Inc.  http://www.novell.com
 //\r
 
 //
@@ -29,8 +31,32 @@
 //
 \r
 using System.Web.Services;\r
+using System.Web.Services.Configuration;\r
+using System.Xml.Serialization;
 \r
 namespace System.Web.Services.Description {\r
+#if NET_2_0\r
+       [XmlFormatExtensionPoint ("Extensions")]\r
+#endif\r
        public sealed class OperationFault : OperationMessage {\r
+               
+#if NET_2_0
+               ServiceDescriptionFormatExtensionCollection extensions;\r
+#endif
+
+               public OperationFault ()
+               {
+#if NET_2_0
+                       extensions = new ServiceDescriptionFormatExtensionCollection (this);\r
+#endif
+               }
+               
+#if NET_2_0
+               [XmlIgnore]
+               public override ServiceDescriptionFormatExtensionCollection Extensions {
+                       get { return extensions; }\r
+               }\r
+#endif
+
        }\r
 }\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs
index e7cdda5ba6db49220b72ea53ad9d140f6e829004..7d6071cb92442725cd335ad2ac27cc9f329a37a1 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs
@@ -3,6 +3,7 @@
 //\r
 // Author:\r
 //   Tim Coleman (tim@timcoleman.com)\r
+//   Ankit Jain (jankit@novell.com)
 //\r
 // Copyright (C) Tim Coleman, 2002\r
 //\r
@@ -29,9 +30,32 @@
 //
 \r
 using System.Web.Services;\r
-using System.Xml;\r
+using System.Web.Services.Configuration;\r
+using System.Xml.Serialization;
 \r
 namespace System.Web.Services.Description {\r
+#if NET_2_0\r
+       [XmlFormatExtensionPoint ("Extensions")]\r
+#endif\r
        public sealed class OperationInput : OperationMessage {\r
+               
+#if NET_2_0
+               ServiceDescriptionFormatExtensionCollection extensions;\r
+#endif
+
+               public OperationInput ()
+               {
+#if NET_2_0
+                       extensions = new ServiceDescriptionFormatExtensionCollection (this);\r
+#endif
+               }
+               
+#if NET_2_0
+               [XmlIgnore]
+               public override ServiceDescriptionFormatExtensionCollection Extensions {
+                       get { return extensions; }\r
+               }\r
+#endif
+
        }\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 466e4aa79cb8a80b8438a259436839e31f8fc34e..660fabae49886ce47b20c0b37341371f33d45f77 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
@@ -49,9 +49,6 @@ namespace System.Web.Services.Description
 #endif\r
                Operation operation;\r
 \r
-#if NET_2_0
-               ServiceDescriptionFormatExtensionCollection extensions;\r
-#endif
                #endregion // Fields\r
 \r
                #region Constructors\r
@@ -60,9 +57,6 @@ namespace System.Web.Services.Description
                {\r
                        message = XmlQualifiedName.Empty;\r
                        operation = null;\r
-#if NET_2_0
-                       extensions = new ServiceDescriptionFormatExtensionCollection (this);\r
-#endif
                }\r
                \r
                #endregion // Constructors\r
@@ -88,13 +82,6 @@ namespace System.Web.Services.Description
                        get { return operation; }\r
                }\r
 
-#if NET_2_0
-               [XmlIgnore]
-               public override ServiceDescriptionFormatExtensionCollection Extensions {
-                       get { return extensions; }\r
-               }\r
-#endif
-
                #endregion // Properties\r
 \r
                #region Methods\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs
index 4318d016c6e722296d63b1d677071f47f377c2aa..d0540b45b3bd9a58d41d3db9cf57d55f97a19436 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs
@@ -3,6 +3,7 @@
 //\r
 // Author:\r
 //   Tim Coleman (tim@timcoleman.com)\r
+//   Ankit Jain (jankit@novell.com)
 //\r
 // Copyright (C) Tim Coleman, 2002\r
 //\r
@@ -28,7 +29,32 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 \r
+using System.Web.Services.Configuration;\r
+using System.Xml.Serialization;
+
 namespace System.Web.Services.Description {\r
+#if NET_2_0\r
+       [XmlFormatExtensionPoint ("Extensions")]\r
+#endif\r
        public sealed class OperationOutput : OperationMessage {\r
+
+#if NET_2_0
+               ServiceDescriptionFormatExtensionCollection extensions;\r
+#endif
+
+               public OperationOutput ()
+               {
+#if NET_2_0
+                       extensions = new ServiceDescriptionFormatExtensionCollection (this);\r
+#endif
+               }
+               
+#if NET_2_0
+               [XmlIgnore]
+               public override ServiceDescriptionFormatExtensionCollection Extensions {
+                       get { return extensions; }\r
+               }\r
+#endif
+
        }\r
 }\r