2003-08-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* System.Web.dll.sources: added ICalls.cs.
	* System.Web.Hosting/ApplicationHost.cs: set hostingInstallDir.
	* System.Web.Hosting/SimpleWorkerRequest.cs: implemented a couple of
	properties.

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

diff --git a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
index d3aad6f3de134116afb51f56c0aae53b55e41574..e3e9731a505b2bc5a5704dfbe56cb456116eac26 100644 (file)
--- a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
@@ -10,6 +10,7 @@ using System;
 using System.Collections;
 using System.IO;
 using System.Runtime.Remoting;
+using System.Web.Util;
 
 namespace System.Web.Hosting
 {
@@ -62,8 +63,7 @@ namespace System.Web.Hosting
                                domain.SetData (key, (string) hTable [key]);
 
                        domain.SetData (".hostingVirtualPath", virtualDir);
-                       //FIXME: this should be the directory where dlls reside.
-                       domain.SetData (".hostingInstallDir", "FIXME hostingInstallDir");
+                       domain.SetData (".hostingInstallDir", ICalls.GetMachineInstallDirectory ());
                        InitConfigInNewAppDomain (domain);
                        ObjectHandle o = domain.CreateInstance (hostType.Assembly.FullName,
                                                                hostType.FullName);

diff --git a/mcs/class/System.Web/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
index 1356e3a36f6940bd3ae75f4b72dfb72651c51c6e..96e8991afcbaa4d1094c88ea52665ed68dbd44c7 100644 (file)
--- a/mcs/class/System.Web/System.Web.Hosting/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * ApplicationHost.cs: set hostingInstallDir.
+       * SimpleWorkerRequest.cs: implemented a couple of properties.
+
 2003-08-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * SimpleWorkerRequest.cs: fixed GetFilePathTranslated and added a

diff --git a/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs b/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
index 6267f54361dde4d070db38e0dbffcfd9c8c55d41..a92a1e8329da07e13aba71c6a0e67f58e4d4c343 100644 (file)
--- a/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
+++ b/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
@@ -9,6 +9,7 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Web.Util;
 
 namespace System.Web.Hosting
 {
@@ -84,16 +85,13 @@ namespace System.Web.Hosting
                                if (_HasInstallInfo)
                                        return _AppInstallPath;
 
-                               return null;
+                               return ICalls.GetMachineInstallDirectory ();
                        }
                }
 
-               [MonoTODO("Get config path from Web.Config class")]
                public override string MachineConfigPath
                {
-                       get {
-                               return "MachineConfigPath"; //FIXME
-                       }
+                       get { return ICalls.GetMachineConfigPath (); }
                }
 
                public override void EndOfRequest ()

diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources
index f0e28125e5242436a2e847cb34c0fcf8629af33e..7b36122aa4536fd79a4bdf76c6e6ed4b3767d978 100755 (executable)
--- a/mcs/class/System.Web/System.Web.dll.sources
+++ b/mcs/class/System.Web/System.Web.dll.sources
@@ -415,6 +415,7 @@ System.Web.Util/FileChangeEventHandler.cs
 System.Web.Util/FileChangedEventArgs.cs
 System.Web.Util/FileChangesMonitor.cs
 System.Web.Util/FilePathParser.cs
+System.Web.Util/ICalls.cs
 System.Web.Util/IISVersionInfo.cs
 System.Web.Util/NativeFileChangeEventHandler.cs
 System.Web.Util/UrlUtils.cs