2007-05-06 Igor Zelmanovich <igorz@mainsoft.com>

[mono.git] / mcs / class / System.Web / System.Web.Configuration / CompilationConfigurationHandler.cs

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
index dff19bb8824899fdbd0ccb2f4fe114f5a6492fe7..b3ea431fa9bfd11dd38d2357379691581ab95e17 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
@@ -27,6 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+#if !NET_2_0
 using System;
 using System.Collections;
 using System.Configuration;
@@ -40,7 +41,9 @@ namespace System.Web.Configuration
                {
                        CompilationConfiguration config = new CompilationConfiguration (parent);
 
-                       config.TempDirectory = AttValue ("tempDirectory", section, true);
+                       string tmp = AttValue ("tempDirectory", section, true);
+                       if (tmp != null && tmp != "")
+                               config.TempDirectory = tmp;
                        config.DefaultLanguage = AttValue ("defaultLanguage", section);
                        if (config.DefaultLanguage == null)
                                config.DefaultLanguage = "c#";
@@ -96,7 +99,11 @@ namespace System.Web.Configuration
                                compiler.Type = AttValue ("type", child);
                                compiler.CompilerOptions = AttValue ("compilerOptions", child, true, true);
                                compiler.WarningLevel = AttUIntValue ("warningLevel", child, 0);
+#if NET_2_0
+                               config.Compilers.Add (compiler);
+#else
                                config.Compilers [compiler.Language] = compiler;
+#endif
                        }
                }
 
@@ -122,7 +129,6 @@ namespace System.Web.Configuration
                                                continue;
                                        }
 
-                                       aname = ShortAsmName (aname);
                                        if (!assemblies.Contains (aname))
                                                assemblies.Add (aname);
 
@@ -134,7 +140,6 @@ namespace System.Web.Configuration
                                                config.AssembliesInBin = false;
                                                continue;
                                        }
-                                       aname = ShortAsmName (aname);
                                        assemblies.Remove (aname);
                                        continue;
                                }
@@ -187,18 +192,11 @@ namespace System.Web.Configuration
                        return HandlersUtil.ExtractAttributeValue (name, node, true);
                }
 
-               private static string ShortAsmName (string long_name)
-               {
-                       int i = long_name.IndexOf (',');
-                       if (i < 0)
-                               return long_name + ".dll";
-                       return long_name.Substring (0, i) + ".dll";
-               }
-               
                static void ThrowException (string message, XmlNode node)
                {
                        HandlersUtil.ThrowException (message, node);
                }
        }
 }
+#endif