we have no System.Configuration assembly in this branch yet

svn path=/branches/mono-1-1-8/mcs/; revision=46809

8 files changed, 24 insertions, 32 deletions

diff --git a/mcs/class/System.Web/System.Web.Configuration/AnonymousIdentificationSection.cs b/mcs/class/System.Web/System.Web.Configuration/AnonymousIdentificationSection.cs
index ca54da04ead..9c94cfcf961 100644
--- a/mcs/class/System.Web/System.Web.Configuration/AnonymousIdentificationSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/AnonymousIdentificationSection.cs
@@ -51,7 +51,7 @@ namespace System.Web.Configuration
 		
 		static AnonymousIdentificationSection ()
 		{
-/*			enabledProp = new ConfigurationProperty ("enabled", typeof(bool), false);
+			enabledProp = new ConfigurationProperty ("enabled", typeof(bool), false);
 			cookieNameProp = new NonEmptyStringConfigurationProperty ("cookieName", ".ASPXANONYMOUS", ConfigurationPropertyFlags.None);
 			cookieTimeoutProp = new TimeSpanConfigurationProperty ("cookieTimeout", new TimeSpan (69,10,40,0), TimeSpanSerializedFormat.Minutes, TimeSpanPropertyFlags.AllowInfinite | TimeSpanPropertyFlags.ProhibitZero, ConfigurationPropertyFlags.None);
 			cookiePathProp = new NonEmptyStringConfigurationProperty ("cookiePath", "/", ConfigurationPropertyFlags.None);
@@ -71,7 +71,7 @@ namespace System.Web.Configuration
 			properties.Add (cookieProtectionProp);
 			properties.Add (cookilessProp);
 			properties.Add (domainProp);
-*/		}
+		}
 		
 		public HttpCookieMode Cookiless {
 			get { return (HttpCookieMode) base [cookilessProp]; }
diff --git a/mcs/class/System.Web/System.Web.Configuration/AssemblyInfo.cs b/mcs/class/System.Web/System.Web.Configuration/AssemblyInfo.cs
index 7e7b37685a0..f4d9db26d6a 100644
--- a/mcs/class/System.Web/System.Web.Configuration/AssemblyInfo.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/AssemblyInfo.cs
@@ -43,8 +43,8 @@ namespace System.Web.Configuration
 		static AssemblyInfo ()
 		{
 			properties = new ConfigurationPropertyCollection ();
-//			assemblyProp = new NonEmptyStringConfigurationProperty ("assembly", null, ConfigurationPropertyFlags.IsKey);
-//			properties.Add (assemblyProp);
+			assemblyProp = new NonEmptyStringConfigurationProperty ("assembly", null, ConfigurationPropertyFlags.IsKey);
+			properties.Add (assemblyProp);
 		}
 		
 		public AssemblyInfo ()
diff --git a/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs b/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
index b14a394e258..5e5dbfcb119 100644
--- a/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs
@@ -43,10 +43,6 @@ namespace System.Web.Configuration
 			//FIXME: add properties
 			props = new ConfigurationPropertyCollection ();
 		}
-		
-		public BuildProviderCollection (): base (CaseInsensitiveComparer.DefaultInvariant)
-		{
-		}
 
 		public BuildProvider this [int index] {
 			get { return (BuildProvider) BaseGet (index); }
@@ -86,6 +82,11 @@ namespace System.Web.Configuration
 			BaseRemoveAt (index);
 		}
 
+		protected override bool CompareKeys (object key1, object key2)
+		{
+			return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
+		}
+
 		protected override ConfigurationElement CreateNewElement ()
 		{
 			return new BuildProvider ();
diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index 78707b1fe6d..a04cc2ec820 100644
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -18,17 +18,6 @@
 	in order to exclude in J2EE configuration usage of unsupported
 	CodeDome API.
 
-2005-06-15  Lluis Sanchez Gual <lluis@novell.com>
-
-	* CodeSubDirectory.cs:
-	* ExpressionBuilder.cs:
-	* AssemblyInfo.cs:
-	* BuildProviderCollection.cs:
-	* ExpressionBuilderCollection.cs:
-	* CodeSubDirectoriesCollection.cs:
-	* AnonymousIdentificationSection.cs: Track 2.0 api changes
-	in System.Configuration.
-
 2005-06-13 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* GlobalizationConfigurationHandler.cs: when an attribute is not
diff --git a/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs b/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
index 2578fee95b9..a0b3176c138 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs
@@ -43,10 +43,6 @@ namespace System.Web.Configuration
 			//FIXME: add properties
 			props = new ConfigurationPropertyCollection ();
 		}
-		
-		public CodeSubDirectoriesCollection (): base (CaseInsensitiveComparer.DefaultInvariant)
-		{
-		}
 
 		public CodeSubDirectory this [int index] {
 			get { return (CodeSubDirectory) BaseGet (index); }
@@ -75,6 +71,11 @@ namespace System.Web.Configuration
 			BaseAdd (codeSubDirectory);
 		}
 
+		protected override bool CompareKeys (object key1, object key2)
+		{
+			return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
+		}
+
 		protected override ConfigurationElement CreateNewElement ()
 		{
 			return new CodeSubDirectory ();
diff --git a/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectory.cs b/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectory.cs
index d1f248ca269..e7ff07c0f53 100644
--- a/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectory.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CodeSubDirectory.cs
@@ -41,11 +41,11 @@ namespace System.Web.Configuration
 		static CodeSubDirectory ()
 		{
 			props = new ConfigurationPropertyCollection ();
-/*			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.IsKey | ConfigurationPropertyFlags.Required;
+			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.IsKey | ConfigurationPropertyFlags.Required;
 			NonEmptyStringFlags strFlags = NonEmptyStringFlags.TrimWhitespace;
 			ConfigurationProperty prop = new NonEmptyStringConfigurationProperty ("directoryName", "", flags, strFlags);
 			props.Add (prop);
-*/		}
+		}
 
 		public string DirectoryName {
 			get { return directoryName; }
diff --git a/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilder.cs
index c20e2038d7a..24e64b07752 100644
--- a/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilder.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilder.cs
@@ -42,7 +42,7 @@ namespace System.Web.Configuration
 
 		static ExpressionBuilder ()
 		{
-/*			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.Required | ConfigurationPropertyFlags.IsKey;
+			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.Required | ConfigurationPropertyFlags.IsKey;
 			type = new NonEmptyStringConfigurationProperty ("type", "", flags);
 			flags = ConfigurationPropertyFlags.Required;
 			expressionPrefix = new NonEmptyStringConfigurationProperty ("expressionPrefix", "", flags);
@@ -50,7 +50,7 @@ namespace System.Web.Configuration
 			props = new ConfigurationPropertyCollection ();
 			props.Add (type);
 			props.Add (expressionPrefix);
-*/		}
+		}
 
 		public string ExpressionPrefix {
 			get { return (string) this [expressionPrefix]; }
diff --git a/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs b/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
index 785c96ada91..c8137450ba0 100644
--- a/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs
@@ -41,14 +41,10 @@ namespace System.Web.Configuration
 		static ExpressionBuilderCollection ()
 		{
 			props = new ConfigurationPropertyCollection ();
-			ConfigurationPropertyOptions flags = ConfigurationPropertyOptions.DefaultCollection;
+			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.DefaultCollection;
 			ConfigurationProperty prop = new ConfigurationProperty (null, typeof (ExpressionBuilderCollection), null, flags);
 			props.Add (prop);
 		}
-		
-		public ExpressionBuilderCollection (): base (CaseInsensitiveComparer.DefaultInvariant)
-		{
-		}
 
 		public ExpressionBuilder this [int index] {
 			get { return (ExpressionBuilder) BaseGet (index); }
@@ -88,6 +84,11 @@ namespace System.Web.Configuration
 			BaseRemoveAt (index);
 		}
 
+		protected override bool CompareKeys (object key1, object key2)
+		{
+			return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
+		}
+
 		protected override ConfigurationElement CreateNewElement ()
 		{
 			return new ExpressionBuilder ();