2007-10-15 Marek Habersack <mhabersack@novell.com>

	* HttpModulesSection.cs: use HttpApplication.LoadType when loading
	modules, to include both the bin/ directory and the top-level
	assemblies in search. Fixes bug #333686.
2007-10-15  Marek Habersack  <mhabersack@novell.com>

	* ModulesConfiguration.cs: load modules using
	HttpApplication.LoadType to include the bin/ directory in search.

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

diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index cde4aedcb8bf45855020cb110c5d7ddf860ffb71..4b0b7baa09b7749aec226b600587e1368f29b94f 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15  Marek Habersack  <mhabersack@novell.com>
+
+       * ModulesConfiguration.cs: load modules using
+       HttpApplication.LoadType to include the bin/ directory in search.
+
 2007-08-30  Marek Habersack  <mhabersack@novell.com>
 
        * MachineKeyRegistryStorage.cs: added

diff --git a/mcs/class/System.Web/System.Web.Configuration/ModulesConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/ModulesConfiguration.cs
index a99a2ff778e169eebb127f84a09d2ee0e865669f..436745791e2dabbd5764719ffc310642bc645342 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/ModulesConfiguration.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/ModulesConfiguration.cs
@@ -71,7 +71,7 @@ namespace System.Web.Configuration
                        Type item_type;
                        
                        try {
-                               item_type = Type.GetType (type, true);
+                               item_type = HttpApplication.LoadType (type, true);
                        } catch (Exception e){
                                throw new HttpException (
                                        String.Format ("Failed to load module `{0}' from type `{1}'", name, type), e);
@@ -108,7 +108,7 @@ namespace System.Web.Configuration
                public HttpModuleCollection LoadModules (HttpApplication app)
                {
                        HttpModuleCollection coll = new HttpModuleCollection ();
-                       foreach (ModuleItem item in Modules){
+                       foreach (ModuleItem item in Modules) {
                                IHttpModule module = (IHttpModule) Activator.CreateInstance (item.Type, true);
                                module.Init (app);
                                coll.AddModule (item.Name, module);

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
index 03853e83e8c1210ccf29e15f8767062f1ce4a2ba..b52d367d46bc139e9160f8bfdf1bc7280860fbcd 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-15  Marek Habersack  <mhabersack@novell.com>
+
+       * HttpModulesSection.cs: use HttpApplication.LoadType when loading
+       modules, to include both the bin/ directory and the top-level
+       assemblies in search. Fixes bug #333686.
+
 2007-08-30  Marek Habersack  <mhabersack@novell.com>
 
        * MachineKeySection.cs: retrieve the keys from the registry before

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs
index 4c2d8a0287e2903face9fff20b5e125e9b334d35..92bc1e3a6020d2e49fa2484cf877a420777e645c 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/HttpModulesSection.cs
@@ -67,8 +67,11 @@ namespace System.Web.Configuration
                internal HttpModuleCollection LoadModules (HttpApplication app)
                {
                        HttpModuleCollection coll = new HttpModuleCollection ();
+                       Type type;
+                       
                        foreach (HttpModuleAction item in Modules){
-                               Type type = Type.GetType (item.Type);
+                               type = HttpApplication.LoadType (item.Type);
+                               
                                if (type == null) {
                                        /* XXX should we throw here? */
                                        continue;