[System.Web.*] Reference source import: System.Web.Profile.(ProfileInfoCollection, ProfileInfo, ProfileAuthenticationOption, DefaultProfile), missing System.Web.ModelBinding and System.Web.UI types, System.Web.ApplicationServices.(...)

13 files changed, 63 insertions, 555 deletions

diff --git a/mcs/class/System.Web.ApplicationServices/Makefile b/mcs/class/System.Web.ApplicationServices/Makefile
index d7389f43e0d..ef185e430fd 100644
--- a/mcs/class/System.Web.ApplicationServices/Makefile
+++ b/mcs/class/System.Web.ApplicationServices/Makefile
@@ -6,6 +6,8 @@ LIBRARY = System.Web.ApplicationServices.dll
 LIB_REFS = System System.Configuration
 LIB_MCS_FLAGS = -d:SYSTEM_WEB_APPLICATIONSERVICES
 
+RESOURCE_STRINGS = ./System.Web.ApplicationServices.txt
+
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
 VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.dll.sources b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.dll.sources
index ce75cae57d6..de8e66df804 100644
--- a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.dll.sources
+++ b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.dll.sources
@@ -3,19 +3,21 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
 
-System.Web.Configuration/MembershipPasswordCompatibilityMode.cs
+../../../external/referencesource/System.Web.ApplicationServices/Configuration/MembershipPasswordCompatibilityMode.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/IMembershipAdapter.cs
 System.Web.Security/IMembershipHelper.cs
 
 System.Web.UI/KeyedList.cs
 System.Web.UI/KeyedListEnumerator.cs
-System.Web.Security/MembershipCreateStatus.cs
-System.Web.Security/MembershipCreateUserException.cs
-System.Web.Security/MembershipPasswordException.cs
-System.Web.Security/MembershipPasswordFormat.cs
-System.Web.Security/MembershipProviderCollection.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/MembershipCreateStatus.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/MembershipCreateUserException.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/MembershipPasswordException.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/MembershipPasswordFormat.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/MembershipProviderCollection.cs
 System.Web.Security/MembershipProvider.cs
-System.Web.Security/MembershipUserCollection.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/MembershipUserCollection.cs
 System.Web.Security/MembershipUser.cs
-System.Web.Security/MembershipValidatePasswordEventHandler.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/MembershipValidatePasswordEventHandler.cs
 System.Web.Security/RoleProvider.cs
-System.Web.Security/ValidatePasswordEventArgs.cs
+../../../external/referencesource/System.Web.ApplicationServices/Security/ValidatePasswordEventArgs.cs
+System.Web/ApplicationServicesStrings.cs
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.txt b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.txt
new file mode 100644
index 00000000000..26d1f17c583
--- /dev/null
+++ b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.txt
@@ -0,0 +1,21 @@
+Can_not_use_encrypted_passwords_with_autogen_keys=You must specify a non-autogenerated machine key to store passwords in the encrypted format. Either specify a different passwordFormat, or change the machineKey configuration to use a non-autogenerated decryption key.
+CustomLoader_ForbiddenByHost=The host forbids the use of custom loaders.
+CustomLoader_MustImplementICustomLoader=The provided type '{0}' must implement the ICustomLoader interface.
+CustomLoader_NoAttributeFound=The assembly '{0}' did not contain an assembly-level CustomLoaderAttribute.
+CustomLoader_NotInFullTrust=Custom loaders can only be used by fully-trusted applications.
+Membership_DuplicateEmail=The E-mail address is already in use.
+Membership_DuplicateProviderUserKey=The provider user key is already in use.
+Membership_DuplicateUserName=The username is already in use.
+Membership_InvalidAnswer=The password-answer supplied is invalid.
+Membership_InvalidEmail=The E-mail supplied is invalid.
+Membership_InvalidPassword=The password supplied is invalid.  Passwords must conform to the password strength requirements configured for the default provider.
+Membership_InvalidProviderUserKey=The provider user key supplied is invalid. It must be of type System.Guid.
+Membership_InvalidQuestion=The password-question supplied is invalid.  Note that the current provider configuration requires a valid password question and answer.  As a result, a CreateUser overload that accepts question and answer parameters must also be used.
+Membership_InvalidUserName=The username supplied is invalid.
+Membership_no_error=No Error.
+Membership_provider_name_invalid=The membership provider name specified is invalid.
+Membership_UserRejected=The user was rejected.
+Parameter_can_not_be_empty=The parameter '{0}' must not be empty.
+Platform_not_supported=This member is not supported on this platfom.
+Provider_Error=The Provider encountered an unknown error.
+Provider_must_implement_type=Provider must implement the class '{0}'.
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Configuration/MembershipPasswordCompatibilityMode.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Configuration/MembershipPasswordCompatibilityMode.cs
deleted file mode 100644
index 367108c0433..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Configuration/MembershipPasswordCompatibilityMode.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Security.MembershipPasswordCompatibilityMode
-//
-// Authors:
-//    Marek Habersack <mhabersack@novell.com>
-//
-// Copyright (C) 2010 Novell, Inc (http://novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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;
-
-namespace System.Web.Configuration
-{
-	public enum MembershipPasswordCompatibilityMode
-	{
-		Framework20,
-		Framework40
-	}
-}
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipCreateStatus.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipCreateStatus.cs
deleted file mode 100644
index 71fddb48a04..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipCreateStatus.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// System.Web.Security.MembershipCreateStatus
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Runtime.CompilerServices;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	public enum MembershipCreateStatus
-	{
-		Success,
-		InvalidUserName,
-		InvalidPassword,
-		InvalidQuestion,
-		InvalidAnswer,
-		InvalidEmail,
-		DuplicateUserName,
-		DuplicateEmail,
-		UserRejected,
-		InvalidProviderUserKey,
-		DuplicateProviderUserKey,
-		ProviderError
-	}
-}
-
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipCreateUserException.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipCreateUserException.cs
deleted file mode 100644
index a5f9e31a70e..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipCreateUserException.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// System.Web.Security.MembershipCreateUserException
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Runtime.Serialization;
-using System.Runtime.CompilerServices;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	[Serializable]
-	public class MembershipCreateUserException : Exception
-	{
-		MembershipCreateStatus statusCode;
-		
-		public MembershipCreateUserException ()
-		{
-		}
-		
-		public MembershipCreateUserException (string message): base (message)
-		{
-		}
-		
-		public MembershipCreateUserException (string message, Exception innerException): base (message, innerException)
-		{
-		}
-		
-		protected MembershipCreateUserException (SerializationInfo info, StreamingContext context): base (info, context)
-		{
-			info.AddValue ("statusCode", statusCode);
-		}
-		
-		public MembershipCreateUserException (MembershipCreateStatus statusCode) : base (statusCode.ToString ())
-		{
-			this.statusCode = statusCode;
-		}
-		
-		public override void GetObjectData (SerializationInfo info, StreamingContext ctx)
-		{
-			base.GetObjectData (info, ctx);
-			statusCode = (MembershipCreateStatus) info.GetValue ("statusCode", typeof(MembershipCreateStatus));
-		}
-		
-		public MembershipCreateStatus StatusCode {
-			get { return statusCode; }
-		}
-	}
-}
-
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipPasswordException.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipPasswordException.cs
deleted file mode 100644
index 5bf60eb9080..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipPasswordException.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// System.Web.Security.MembershipPasswordException
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Runtime.Serialization;
-using System.Runtime.CompilerServices;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	[Serializable]
-	public class MembershipPasswordException : Exception
-	{
-		public MembershipPasswordException () : base () {}
-		public MembershipPasswordException (string message) : base (message) {}
-		public MembershipPasswordException (string message, Exception innerException) : base (message, innerException) {}
-		
-		protected MembershipPasswordException (SerializationInfo info, StreamingContext context): base (info, context)
-		{
-		}
-	}
-}
-
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipPasswordFormat.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipPasswordFormat.cs
deleted file mode 100644
index 294861808d9..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipPasswordFormat.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Web.Security.MembershipPasswordFormat
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Runtime.CompilerServices;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	public enum MembershipPasswordFormat
-	{
-		Clear = 0, 
-		Hashed = 1,
-		Encrypted = 2
-	}
-}
-
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipProviderCollection.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipProviderCollection.cs
deleted file mode 100644
index be25a051cc7..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipProviderCollection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// System.Web.Security.MembershipProviderCollection
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//	Sebastien Pouliot  <sebastien@ximian.com>
-//
-// (C) 2003 Ben Maurer
-// Copyright (c) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Configuration.Provider;
-using System.Runtime.CompilerServices;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	public sealed class MembershipProviderCollection : ProviderCollection
-	{
-		public override void Add (ProviderBase provider)
-		{
-			if (provider == null)
-				throw new ArgumentNullException ("provider");
-
-			if (provider is MembershipProvider)
-				base.Add (provider);
-			else {
-				throw new ArgumentException ("provider", Locale.GetText (
-					"Wrong type, expected {0}.", "MembershipProvider"));
-			}
-		}
-		
-		public void CopyTo (MembershipProvider[] array, int index)
-		{
-			base.CopyTo (array, index);
-		}
-		
-		public new MembershipProvider this [string name] {
-			get { return (MembershipProvider) base [name]; }
-		}
-	}
-}
-
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipUserCollection.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipUserCollection.cs
deleted file mode 100644
index bbb689fa3eb..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipUserCollection.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// System.Web.Security.MembershipUserCollection
-//
-// Authors:
-//	Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Collections;
-using System.Runtime.CompilerServices;
-using System.Web.UI;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	[Serializable]
-	public sealed class MembershipUserCollection : ICollection
-	{
-		public MembershipUserCollection ()
-		{
-		}
-		
-		public void Add (MembershipUser user)
-		{
-			if (user == null)
-				throw new ArgumentNullException ("user");
-
-			CheckNotReadOnly ();
-			store.Add (user.UserName, user);
-		}
-		
-		public void Clear ()
-		{
-			CheckNotReadOnly ();
-			store.Clear ();
-		}
-		
-		void ICollection.CopyTo (Array array, int index)
-		{
-			store.Values.CopyTo (array, index);
-		}
-		
-		public void CopyTo (MembershipUser[] array, int index)
-		{
-			store.Values.CopyTo (array, index);
-		}
-		
-		public IEnumerator GetEnumerator ()
-		{
-			return ((IEnumerable) store).GetEnumerator ();
-		}
-		
-		public void Remove (string name)
-		{
-			CheckNotReadOnly ();
-			store.Remove (name);
-		}
-		
-		public void SetReadOnly ()
-		{
-			readOnly = true;
-		}
-		
-		public int Count {
-			get { return store.Count; }
-		}
-		
-		public bool IsSynchronized {
-			get { return false; }
-		}
-		
-		public MembershipUser this [string name] {
-			get { return (MembershipUser) store [name]; }
-		}
-		
-		public object SyncRoot {
-			get { return this; }
-		}
-		
-		void CheckNotReadOnly ()
-		{
-			if (readOnly)
-				throw new NotSupportedException ();
-		}
-		
-		KeyedList store = new KeyedList ();
-		bool readOnly = false;
-	}
-}
-
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipValidatePasswordEventHandler.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipValidatePasswordEventHandler.cs
deleted file mode 100644
index 1c475112c66..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/MembershipValidatePasswordEventHandler.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.Security.MembershipValidatePasswordEventHandler
-//
-// Authors:
-//	Lluis Sanchez Gual (lluis@novell.com)
-//
-// (C) 2005 Novell, inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Runtime.CompilerServices;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	public delegate void MembershipValidatePasswordEventHandler (object sender, ValidatePasswordEventArgs e);
-}
-
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.Security/ValidatePasswordEventArgs.cs b/mcs/class/System.Web.ApplicationServices/System.Web.Security/ValidatePasswordEventArgs.cs
deleted file mode 100644
index ea189038e8e..00000000000
--- a/mcs/class/System.Web.ApplicationServices/System.Web.Security/ValidatePasswordEventArgs.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// System.Web.Security.ValidatePasswordEventArgs
-//
-// Authors:
-//	Lluis Sanchez Gual (lluis@novell.com)
-//
-// (C) 2005 Novell, inc.
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// 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.Runtime.CompilerServices;
-
-namespace System.Web.Security
-{
-	[TypeForwardedFrom ("System.Web, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-	public sealed class ValidatePasswordEventArgs: EventArgs
-	{
-		bool cancel;
-		Exception exception;
-		bool isNewUser;
-		string userName;
-		string password;
-		
-		public ValidatePasswordEventArgs (string userName, string password, bool isNewUser)
-		{
-			this.isNewUser = isNewUser;
-			this.userName = userName;
-			this.password = password;
-		}
-		
-		public bool Cancel {
-			get { return cancel; }
-			set { cancel = value; }
-		}
-		
-		public Exception FailureInformation {
-			get { return exception; }
-			set { exception = value; }
-		}
-		
-		public bool IsNewUser {
-			get { return isNewUser; }
-		}
-		
-		public string UserName {
-			get { return userName; }
-		}
-		
-		public string Password {
-			get { return password; }
-		}
-	}
-}
-
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web/ApplicationServicesStrings.cs b/mcs/class/System.Web.ApplicationServices/System.Web/ApplicationServicesStrings.cs
new file mode 100644
index 00000000000..61fda8a82bc
--- /dev/null
+++ b/mcs/class/System.Web.ApplicationServices/System.Web/ApplicationServicesStrings.cs
@@ -0,0 +1,29 @@
+namespace System.Web
+{
+    internal class ApplicationServicesStrings
+    {
+      internal const string Can_not_use_encrypted_passwords_with_autogen_keys = "You must specify a non-autogenerated machine key to store passwords in the encrypted format. Either specify a different passwordFormat, or change the machineKey configuration to use a non-autogenerated decryption key.";
+      internal const string CustomLoader_ForbiddenByHost = "The host forbids the use of custom loaders.";
+      internal const string CustomLoader_MustImplementICustomLoader = "The provided type '{0}' must implement the ICustomLoader interface.";
+      internal const string CustomLoader_NoAttributeFound = "The assembly '{0}' did not contain an assembly-level CustomLoaderAttribute.";
+      internal const string CustomLoader_NotInFullTrust = "Custom loaders can only be used by fully-trusted applications (<trust level=\"Full\" />).";
+      internal const string Membership_DuplicateEmail = "The E-mail address is already in use.";
+      internal const string Membership_DuplicateProviderUserKey = "The provider user key is already in use.";
+      internal const string Membership_DuplicateUserName = "The username is already in use.";
+      internal const string Membership_InvalidAnswer = "The password-answer supplied is invalid.";
+      internal const string Membership_InvalidEmail = "The E-mail supplied is invalid.";
+      internal const string Membership_InvalidPassword = "The password supplied is invalid.  Passwords must conform to the password strength requirements configured for the default provider.";
+      internal const string Membership_InvalidProviderUserKey = "The provider user key supplied is invalid. It must be of type System.Guid.";
+      internal const string Membership_InvalidQuestion = "The password-question supplied is invalid.  Note that the current provider configuration requires a valid password question and answer.  As a result, a CreateUser overload that accepts question and answer parameters must also be used.";
+      internal const string Membership_InvalidUserName = "The username supplied is invalid.";
+      internal const string Membership_no_error = "No Error.";
+      internal const string Membership_provider_name_invalid = "The membership provider name specified is invalid.";
+      internal const string Membership_UserRejected = "The user was rejected.";
+      internal const string Parameter_can_not_be_empty = "The parameter '{0}' must not be empty.";
+      internal const string Platform_not_supported = "This member is not supported on the .NET Framework Client Profile.";
+      internal const string Provider_Error = "The Provider encountered an unknown error.";
+      internal const string Provider_must_implement_type = "Provider must implement the class '{0}'.";
+    }
+}
+
+