[Mono-patches] r55695 - trunk/mcs/class/System.Web/System.Web

[Chris Toshok]

Author: toshok
Date: 2006-01-17 16:09:26 -0500 (Tue, 17 Jan 2006)
New Revision: 55695

Modified:
   trunk/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
   trunk/mcs/class/System.Web/System.Web/ChangeLog
   trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs
Log:
2006-01-17  Chris Toshok  <[EMAIL PROTECTED]>

        * CapabilitiesLoader.cs (Init): use WebConfigurationManager in the
        CONFIGURATION_2_0 case.

        * HttpRuntime.cs (MachineConfigurationDirectory): same.



Modified: trunk/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs 2006-01-17 
20:55:13 UTC (rev 55694)
+++ trunk/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs 2006-01-17 
21:09:26 UTC (rev 55695)
@@ -184,7 +184,11 @@
 #if TARGET_J2EE
                                string filepath = "browscap.ini";
 #else
+#if CONFIGURATION_2_0
+                               string dir = Path.GetDirectoryName 
(WebConfigurationManager.OpenMachineConfiguration().FilePath);
+#else
                                string dir = Path.GetDirectoryName 
(WebConfigurationSettings.MachineConfigPath);
+#endif
                                string filepath = Path.Combine (dir, 
"browscap.ini");
                                if (!File.Exists (filepath)) {
                                        // try removing the trailing version 
directory

Modified: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog     2006-01-17 20:55:13 UTC 
(rev 55694)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog     2006-01-17 21:09:26 UTC 
(rev 55695)
@@ -1,3 +1,10 @@
+2006-01-17  Chris Toshok  <[EMAIL PROTECTED]>
+
+       * CapabilitiesLoader.cs (Init): use WebConfigurationManager in the
+       CONFIGURATION_2_0 case.
+
+       * HttpRuntime.cs (MachineConfigurationDirectory): same.
+
 2006-01-16  Chris Toshok  <[EMAIL PROTECTED]>
 
        * HttpApplicationFactory.cs: call WebConfigurationManager.Init in

Modified: trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs        2006-01-17 
20:55:13 UTC (rev 55694)
+++ trunk/mcs/class/System.Web/System.Web/HttpRuntime.cs        2006-01-17 
21:09:26 UTC (rev 55695)
@@ -205,7 +205,11 @@
 
                public static string MachineConfigurationDirectory {
                        get {
+#if CONFIGURATION_2_0
+                               string dirname = Path.GetDirectoryName 
(WebConfigurationManager.OpenMachineConfiguration().FilePath);
+#else
                                string dirname = Path.GetDirectoryName 
(WebConfigurationSettings.MachineConfigPath);
+#endif
                                if ((dirname != null) && (dirname.Length > 0) 
&& SecurityManager.SecurityEnabled) {
                                        new FileIOPermission 
(FileIOPermissionAccess.PathDiscovery, dirname).Demand ();
                                }

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches