Author: mhabersack
Date: 2007-12-12 12:05:14 -0500 (Wed, 12 Dec 2007)
New Revision: 91160

Modified:
   trunk/mcs/class/System.Web/System.Web.Util/ChangeLog
   trunk/mcs/class/System.Web/System.Web.Util/SettingsMappingManager.cs
Log:
2007-12-12  Marek Habersack  <[EMAIL PROTECTED]>

        * SettingsMappingManager.cs: use the 'settings.map.config' name
        for the application-specific mapper configuration. This ensures
        that the file won't be downloadable on systems which don't support
        the mapping feature without the need to add the extra handler
        entry to the app's Web.config file. Thanks to Joe Audette for the
        idea.


Modified: trunk/mcs/class/System.Web/System.Web.Util/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Util/ChangeLog        2007-12-12 
15:58:47 UTC (rev 91159)
+++ trunk/mcs/class/System.Web/System.Web.Util/ChangeLog        2007-12-12 
17:05:14 UTC (rev 91160)
@@ -1,3 +1,12 @@
+2007-12-12  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * SettingsMappingManager.cs: use the 'settings.map.config' name
+       for the application-specific mapper configuration. This ensures
+       that the file won't be downloadable on systems which don't support
+       the mapping feature without the need to add the extra handler
+       entry to the app's Web.config file. Thanks to Joe Audette for the
+       idea.
+
 2007-12-11  Marek Habersack  <[EMAIL PROTECTED]>
 
        * SettingsMappingManager.cs: made the class public - it is

Modified: trunk/mcs/class/System.Web/System.Web.Util/SettingsMappingManager.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Util/SettingsMappingManager.cs        
2007-12-12 15:58:47 UTC (rev 91159)
+++ trunk/mcs/class/System.Web/System.Web.Util/SettingsMappingManager.cs        
2007-12-12 17:05:14 UTC (rev 91160)
@@ -43,6 +43,7 @@
        public class SettingsMappingManager
        {
                const string settingsMapFileName = "settings.map";
+               const string localSettingsMapFileName = settingsMapFileName + 
".config";
                
                static SettingsMappingManager _instance;
                static string _mappingFile;
@@ -98,7 +99,7 @@
                                LoadMappings (_mappingFile);
 
                        AppDomainSetup domain = 
AppDomain.CurrentDomain.SetupInformation;
-                       string appMappingFile = Path.Combine 
(domain.ApplicationBase, settingsMapFileName);
+                       string appMappingFile = Path.Combine 
(domain.ApplicationBase, localSettingsMapFileName);
                        if (File.Exists (appMappingFile))
                                LoadMappings (appMappingFile);
                }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to