2005-03-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* CompilerCollection.cs:
	* CompilationConfigurationHandler.cs:
	* Compiler.cs:
	* CompilationSection.cs:
	* CompilationConfiguration.cs: reverted last patch and/or disable code
	until the whole config system is migrated to 2.0. Fixes bug #73736.

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

diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index be4cb94fb0a655a4fe623edfe833c34ae8d0c549..78fdd41489a87d13b2bcfbe5a8127abc9ecebac5 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * CompilerCollection.cs:
+       * CompilationConfigurationHandler.cs:
+       * Compiler.cs:
+       * CompilationSection.cs:
+       * CompilationConfiguration.cs: reverted last patch and/or disable code
+       until the whole config system is migrated to 2.0. Fixes bug #73736.
+
 2005-03-14 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * CodeSubDirectoriesCollection.cs:

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
index 58ae42d5e9516510efaac64bae2989fb363d0e93..a2e3e8e70bc272426631ec2c8f6052b06975a669 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
@@ -129,11 +129,7 @@ namespace System.Web.Configuration
                        num_recompiles_before_app_restart = parent.num_recompiles_before_app_restart;
                        strict = parent.strict;
                        temp_directory = parent.temp_directory;
-#if !NET_2_0
                        compilers = new CompilerCollection (parent.compilers);
-#else
-                       compilers = new CompilerCollection ();
-#endif
                        ArrayList p = parent.assemblies;
                        assembliesInBin = parent.assembliesInBin;
                        ICollection coll = (p == null) ? (ICollection) new object [0] : p;

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
index c1238384cec170dadc85b5091578edc26b4e3c4c..dff19bb8824899fdbd0ccb2f4fe114f5a6492fe7 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-
 using System;
 using System.Collections;
 using System.Configuration;
@@ -92,14 +91,11 @@ namespace System.Web.Configuration
                                        ThrowException ("Unexpected element", child);
 
                                Compiler compiler = new Compiler ();
-#if !NET_2_0
-// Removing this for 2.0 is a hack until the whole config. system is migrated to 2.0
                                compiler.Language  = AttValue ("language", child);
                                compiler.Extension  = AttValue ("extension", child);
                                compiler.Type = AttValue ("type", child);
                                compiler.CompilerOptions = AttValue ("compilerOptions", child, true, true);
                                compiler.WarningLevel = AttUIntValue ("warningLevel", child, 0);
-#endif
                                config.Compilers [compiler.Language] = compiler;
                        }
                }

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs
index 5c8d27a4e6bb22241f6b85150381aabc54b5107c..5ee0d91195f56124306611295ec8c7bdd6eed789 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs
@@ -75,8 +75,8 @@ namespace System.Web.Configuration
                        props.Add (batchTimeout);
                        codeSubDirectories = new ConfigurationProperty ("codeSubDirectories", typeof (CodeSubDirectoriesCollection), 0);
                        props.Add (codeSubDirectories);
-                       compilers = new ConfigurationProperty ("compilers", typeof (CompilerCollection), 0);
-                       props.Add (compilers);
+                       //compilers = new ConfigurationProperty ("compilers", typeof (CompilerCollection), 0);
+                       //props.Add (compilers);
                        debug = new ConfigurationProperty ("debug", boolType, false, boolTypeConv, null, 0);
                        props.Add (debug);
                        defaultLanguage = new ConfigurationProperty ("defaultLanguage", strType, "c#", strTypeConv, null, 0);
@@ -125,9 +125,11 @@ namespace System.Web.Configuration
                        get { return (CodeSubDirectoriesCollection) this [codeSubDirectories]; }
                }
 
+               /*
                public CompilerCollection Compilers {
                        get { return (CompilerCollection) this [compilers]; }
                }
+               */
 
                public bool Debug {
                        get { return (bool) this [debug]; }

diff --git a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
index c15087b5055c2ca55b43f295e852cab934ec7a41..7b3b10dcb650a4dd13692b01b5578a4f153f81d9 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
@@ -34,7 +34,6 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
-#if !NET_2_0
        class Compiler
        {
                public string Language;
@@ -53,7 +52,7 @@ namespace System.Web.Configuration
                                "CompilerOptions: " + CompilerOptions + "\n";
                }
        }
-#else // NET_2_0
+#if false
        public sealed class Compiler : ConfigurationElement
        {
                static ConfigurationPropertyCollection props;

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
index ad5ef5c34d294fe420feaf746dd3749083420301..5483b7b5aa8e88dd473cde0f44d42a892c3df854 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
@@ -34,7 +34,6 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
-#if !NET_2_0
        sealed class CompilerCollection
        {
                Hashtable compilers;
@@ -65,7 +64,7 @@ namespace System.Web.Configuration
                        }
                }
        }
-#else // NET_2_0
+#if false
        public sealed class CompilerCollection : ConfigurationElementCollection
        {
                static ConfigurationPropertyCollection props;