* TemplateControl: GetAssemblyResource is called with absolute virtual path

* PageMapper: dynamic compilation currently is not supported

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

diff --git a/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs b/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
index 2e7a8a824b8e90d2a403e14abe5058c53012bafc..7be3c93fafd62ed19522cecda2bcc8728b2d722b 100644 (file)
--- a/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
+++ b/mcs/class/System.Web/System.Web.J2EE/PageMapper.cs
@@ -400,7 +400,7 @@ namespace System.Web.J2EE
                        Console.WriteLine("fullFileName=" + fullFileName);
 #endif
                        //type not found - run aspxparser
-                       if (File.Exists(fullFileName) || Directory.Exists(fullFileName))
+                       if (false/*File.Exists(fullFileName) || Directory.Exists(fullFileName)*/) //dynamic compilation currently is not supported
                        {
                                string[] command = GetParserCmd(fileName.ToLower() == "global.asax");
                                if (J2EEUtils.RunProc(command) != 0)

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs b/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
index 78c8754269b9c0b5591b2c8c88337700082b0eb8..04962e55b9d5e819a35675591bf5d1bd208f6698 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
@@ -352,7 +352,7 @@ namespace System.Web.UI {
                        java.lang.ClassLoader contextClassLoader = c.getClassLoader ();
 
                        //TODO:move this code to page mapper
-                       string assemblyName = PageMapper.GetAssemblyResource (HttpContext.Current, this.AppRelativeVirtualPath);
+                       string assemblyName = PageMapper.GetAssemblyResource (Context, Context.Request.FilePath);
                        if (assemblyName == null)
                                throw new HttpException (404, "The requested resource (" + this.AppRelativeVirtualPath + ") is not available.");