In System.Web.Services.Description:

2006-06-08  Chris Toshok  <toshok@ximian.com>

	* ExtensionManager.cs: remove the CONFIGURATION_2_0 from ifdefs.
	NET_2_0 implies this now.

In System.Web.Services.Protocols:
2006-06-08  Chris Toshok  <toshok@ximian.com>

	* WebServiceHandlerFactory.cs: remove the CONFIGURATION_2_0 from
	ifdefs. NET_2_0 implies this now.

	* SoapExtension.cs: same.

	* SoapDocumentationHandler.cs: same.

In .:
2006-06-08  Chris Toshok  <toshok@ximian.com>

	* Makefile (LIB_MCS_FLAGS): remove the CONFIGURATION_2_0 define.
	NET_2_0 implies this now.

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

diff --git a/mcs/class/System.Web.Services/ChangeLog b/mcs/class/System.Web.Services/ChangeLog
index acf49b7a65c7ebad9dd9a2a8a5cfffc27ff2e6bd..c7502fb967e24d8a8122af1b50ed3f3970c49b3a 100644 (file)
--- a/mcs/class/System.Web.Services/ChangeLog
+++ b/mcs/class/System.Web.Services/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-08  Chris Toshok  <toshok@ximian.com>
+
+       * Makefile (LIB_MCS_FLAGS): remove the CONFIGURATION_2_0 define.
+       NET_2_0 implies this now.
+
 2006-03-15  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * System.Web.Services.vmwcsproj: fixed links to Consts.cs, Locale.cs

diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 8b3d63fc87993dc4ebcb79a4ec58d74dfc915945..ba7c2eebb8354b850e967f1cb93da8a99bd91146 100644 (file)
--- a/mcs/class/System.Web.Services/Makefile
+++ b/mcs/class/System.Web.Services/Makefile
@@ -12,7 +12,7 @@ LIB_MCS_FLAGS = \
        -r:System.Web.dll
 
 ifeq (net_2_0, $(PROFILE))
-LIB_MCS_FLAGS += -r:System.Configuration.dll -d:CONFIGURATION_2_0
+LIB_MCS_FLAGS += -r:System.Configuration.dll
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618

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 ed0d66759fd31bfb4ea8a8807fe04d552d13b5b7..d32daf309ed026bfdc02842c183536b5706c83c1 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,8 @@
+2006-06-08  Chris Toshok  <toshok@ximian.com>
+
+       * ExtensionManager.cs: remove the CONFIGURATION_2_0 from ifdefs.
+       NET_2_0 implies this now.
+
 2006-05-03  Ankit Jain  <jankit@novell.com>
 
        * wsdl.genxs: Call ReadExtension for all unknown elements.

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs
index 285451ca749f6c49e421a60309e033180a86606b..94f2234e3f5ed31e442704a0c7a59ba866f11353 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs
@@ -64,7 +64,7 @@ namespace System.Web.Services.Description
                        RegisterExtensionType (typeof (SoapHeaderBinding));\r
 //                     RegisterExtensionType (typeof (SoapHeaderFaultBinding));\r
                        RegisterExtensionType (typeof (SoapOperationBinding));\r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                        foreach (TypeElement el in WebServicesSection.Instance.ServiceDescriptionFormatExtensionTypes)
                                RegisterExtensionType (el.Type);
 #else
@@ -155,7 +155,7 @@ namespace System.Web.Services.Description
                \r
                public static ArrayList BuildExtensionImporters ()\r
                {\r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                        return BuildExtensionList (WebServicesSection.Instance.SoapExtensionImporterTypes);
 #else
                        return BuildExtensionList (WSConfig.Instance.ExtensionImporterTypes);\r
@@ -164,14 +164,14 @@ namespace System.Web.Services.Description
                \r
                public static ArrayList BuildExtensionReflectors ()\r
                {\r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                        return BuildExtensionList (WebServicesSection.Instance.SoapExtensionReflectorTypes);
 #else
                        return BuildExtensionList (WSConfig.Instance.ExtensionReflectorTypes);\r
 #endif
                }\r
                \r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                public static ArrayList BuildExtensionList (TypeElementCollection exts)\r
 #else
                public static ArrayList BuildExtensionList (ArrayList exts)\r
@@ -181,7 +181,7 @@ namespace System.Web.Services.Description
                        \r
                        if (exts != null)\r
                        {\r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                                foreach (TypeElement econf in exts)
                                {
                                        extensionTypes.Add (econf);
@@ -205,7 +205,7 @@ namespace System.Web.Services.Description
                        }\r
 \r
                        ArrayList extensions = new ArrayList (extensionTypes.Count);\r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                        foreach (TypeElement econf in extensionTypes)\r
 #else
                        foreach (WSExtensionConfig econf in extensionTypes)\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
index ae9040d397996ea7fb14ab0c75ae44a8be785e3b..bd28f83dc4ede96fc0531a2c8ebb3dcbea30854f 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-08  Chris Toshok  <toshok@ximian.com>
+
+       * WebServiceHandlerFactory.cs: remove the CONFIGURATION_2_0 from
+       ifdefs. NET_2_0 implies this now.
+
+       * SoapExtension.cs: same.
+
+       * SoapDocumentationHandler.cs: same.
+
 2006-03-15  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * SoapExtension.cs: fixed ExecuteProcessMessage signature, added 

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
index d6efbc9f32b59246519cad5c318afc55ec150ce3..1d7ae0d1005ddcc6a2e7fff5946dd50d73143855 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentationHandler.cs
@@ -76,7 +76,7 @@ namespace System.Web.Services.Protocols
                        if (key == "wsdl" || key == "schema" || key == "code" || key == "disco")
                                return;
                                
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                        string help = WebServicesSection.Instance.WsdlHelpGenerator.Href;
                        string path = Path.GetDirectoryName (ConfigurationManager.OpenMachineConfiguration().FilePath);
 #else

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
index 194c1adcb7161d36e6687bf5acb9895187847441..bbd0b4c07b81ea7797367c96fb5ac3d19d3718a4 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
@@ -115,14 +115,14 @@ namespace System.Web.Services.Protocols {
                {\r
                        globalExtensions = new ArrayList[2];\r
                        \r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                        SoapExtensionTypeElementCollection exts = WebServicesSection.Instance.SoapExtensionTypes;\r
 #else
                        ArrayList exts = WSConfig.Instance.ExtensionTypes;\r
                        if (exts == null) return;\r
 #endif
 \r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                        foreach (SoapExtensionTypeElement econf in exts)\r
 #else
                        foreach (WSExtensionConfig econf in exts)\r
@@ -132,7 +132,7 @@ namespace System.Web.Services.Protocols {
                                ArrayList destList = globalExtensions [(int) econf.Group];\r
                                bool added = false;\r
                                for (int n=0; n<destList.Count && !added; n++)\r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                                        if (((SoapExtensionTypeElement)destList [n]).Priority > econf.Priority) {\r
 #else
                                        if (((WSExtensionConfig)destList [n]).Priority > econf.Priority) {\r
@@ -157,7 +157,7 @@ namespace System.Web.Services.Protocols {
                                exts [group] = new SoapExtensionRuntimeConfig [globList.Count];\r
                                for (int n=0; n<globList.Count; n++)\r
                                {\r
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
                                        SoapExtensionTypeElement econf = (SoapExtensionTypeElement) globList [n];\r
 #else
                                        WSExtensionConfig econf = (WSExtensionConfig) globList [n];\r

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs
index 64e3047ba71871f96a0c312adc49b34370b265e7..fcd3bd531102adaed1a645ed7a91dd7545dec57f 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs
@@ -39,7 +39,7 @@ using System.Web.Services.Configuration;
 using System.Web.SessionState;
 using System.Web.UI;
 using System.Collections.Specialized;
-#if NET_2_0 && CONFIGURATION_2_0
+#if NET_2_0
 using WSConfig = System.Web.Services.Configuration.WebServicesSection;
 using WSProtocol = System.Web.Services.Configuration.WebServiceProtocols;
 #endif