[System.Web] Fixes make dist

22 files changed, 0 insertions, 4487 deletions

diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs
deleted file mode 100644
index 6310cc0d2fb..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// HttpApplicationStateBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpApplicationStateBase : NameObjectCollectionBase, ICollection, IEnumerable
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual string [] AllKeys {
-			get { NotImplemented (); return null; }
-		}
-
-		public virtual HttpApplicationStateBase Contents {
-			get { NotImplemented (); return null; }
-		}
-
-		public override int Count {
-			get { NotImplemented (); return 0; }
-		}
-
-		public virtual bool IsSynchronized {
-			get { NotImplemented (); return false; }
-		}
-
-		public virtual object this [int index] {
-			get { return Get (index); }
-		}
-
-		public virtual object this [string name] {
-			get { return Get (name); }
-			set { Set (name, value); }
-		}
-
-		public virtual HttpStaticObjectsCollectionBase StaticObjects {
-			get { NotImplemented (); return null; }
-		}
-
-		public virtual object SyncRoot {
-			get { NotImplemented (); return null; }
-		}
-
-		public virtual void Add (string name, object value)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Clear ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void CopyTo (Array array, int index)
-		{
-			NotImplemented ();
-		}
-
-		public virtual object Get (int index)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object Get (string name)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual string GetKey (int index)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void Lock ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Remove (string name)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RemoveAll ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RemoveAt (int index)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Set (string name, object value)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void UnLock ()
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs
deleted file mode 100644
index d0299ef73fd..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// HttpApplicationStateWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpApplicationStateWrapper : HttpApplicationStateBase
-	{
-		HttpApplicationState w;
-
-		public HttpApplicationStateWrapper (HttpApplicationState httpApplicationState)
-		{
-			if (httpApplicationState == null)
-				throw new ArgumentNullException ("httpApplicationState");
-			w = httpApplicationState;
-		}
-
-		public override string [] AllKeys {
-			get { return w.AllKeys; }
-		}
-
-		public override HttpApplicationStateBase Contents {
-			get { return new HttpApplicationStateWrapper (w.Contents); }
-		}
-
-		public override int Count {
-			get { return w.Count; }
-		}
-
-		public override bool IsSynchronized {
-			get { return ((ICollection) this).IsSynchronized; }
-		}
-
-		public override object this [int index] {
-			get { return Get (index); }
-		}
-
-		public override object this [string name] {
-			get { return Get (name); }
-			set { Set (name, value); }
-		}
-
-		public override NameObjectCollectionBase.KeysCollection Keys {
-			get { return w.Keys; }
-		}
-
-		public override HttpStaticObjectsCollectionBase StaticObjects {
-			get { return new HttpStaticObjectsCollectionWrapper (w.StaticObjects); }
-		}
-
-		public override object SyncRoot {
-			get { return ((ICollection) this).SyncRoot; }
-		}
-
-		public override void Add (string name, object value)
-		{
-			w.Add (name, value);
-		}
-
-		public override void Clear ()
-		{
-			w.Clear ();
-		}
-
-		public override void CopyTo (Array array, int index)
-		{
-			((ICollection) this).CopyTo (array, index);
-		}
-
-		public override object Get (int index)
-		{
-			return w.Get (index);
-		}
-
-		public override object Get (string name)
-		{
-			return w.Get (name);
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			return w.GetEnumerator ();
-		}
-
-		public override string GetKey (int index)
-		{
-			return w.GetKey (index);
-		}
-
-		[MonoTODO]
-		public override void GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			w.GetObjectData (info, context);
-
-			throw new NotImplementedException ();
-		}
-
-		public override void Lock ()
-		{
-			w.Lock ();
-		}
-
-		public override void OnDeserialization (object sender)
-		{
-			w.OnDeserialization (sender);
-		}
-
-		public override void Remove (string name)
-		{
-			w.Remove (name);
-		}
-
-		public override void RemoveAll ()
-		{
-			w.RemoveAll ();
-		}
-
-		public override void RemoveAt (int index)
-		{
-			w.RemoveAt (index);
-		}
-
-		public override void Set (string name, object value)
-		{
-			w.Set (name, value);
-		}
-
-		public override void UnLock ()
-		{
-			w.UnLock ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs
deleted file mode 100644
index cd9139966f1..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-//
-// HttpBrowserCapabilitiesBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.UI;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpBrowserCapabilitiesBase : IFilterResolutionService
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual bool ActiveXControls { get { NotImplemented (); return false; } }
-
-		public virtual IDictionary Adapters { get { NotImplemented (); return null; } }
-
-		public virtual bool AOL { get { NotImplemented (); return false; } }
-
-		public virtual bool BackgroundSounds { get { NotImplemented (); return false; } }
-
-		public virtual bool Beta { get { NotImplemented (); return false; } }
-
-		public virtual string Browser { get { NotImplemented (); return null; } }
-
-		public virtual ArrayList Browsers { get { NotImplemented (); return null; } }
-
-		public virtual bool CanCombineFormsInDeck { get { NotImplemented (); return false; } }
-
-		public virtual bool CanInitiateVoiceCall { get { NotImplemented (); return false; } }
-
-		public virtual bool CanRenderAfterInputOrSelectElement { get { NotImplemented (); return false; } }
-
-		public virtual bool CanRenderEmptySelects { get { NotImplemented (); return false; } }
-
-		public virtual bool CanRenderInputAndSelectElementsTogether { get { NotImplemented (); return false; } }
-
-		public virtual bool CanRenderMixedSelects { get { NotImplemented (); return false; } }
-
-		public virtual bool CanRenderOneventAndPrevElementsTogether { get { NotImplemented (); return false; } }
-
-		public virtual bool CanRenderPostBackCards { get { NotImplemented (); return false; } }
-
-		public virtual bool CanRenderSetvarZeroWithMultiSelectionList { get { NotImplemented (); return false; } }
-
-		public virtual bool CanSendMail { get { NotImplemented (); return false; } }
-
-		public virtual IDictionary Capabilities { get; set; }
-
-		public virtual bool CDF { get { NotImplemented (); return false; } }
-
-		public virtual Version ClrVersion { get { NotImplemented (); return null; } }
-
-		public virtual bool Cookies { get { NotImplemented (); return false; } }
-
-		public virtual bool Crawler { get { NotImplemented (); return false; } }
-
-		public virtual int DefaultSubmitButtonLimit { get { NotImplemented (); return 0; } }
-
-		public virtual Version EcmaScriptVersion { get { NotImplemented (); return null; } }
-
-		public virtual bool Frames { get { NotImplemented (); return false; } }
-
-		public virtual int GatewayMajorVersion { get { NotImplemented (); return 0; } }
-
-		public virtual double GatewayMinorVersion { get { NotImplemented (); return 0; } }
-
-		public virtual string GatewayVersion { get { NotImplemented (); return null; } }
-
-		public virtual bool HasBackButton { get { NotImplemented (); return false; } }
-
-		public virtual bool HidesRightAlignedMultiselectScrollbars { get { NotImplemented (); return false; } }
-
-		public virtual string HtmlTextWriter { get; set; }
-
-		public virtual string Id { get { NotImplemented (); return null; } }
-
-		public virtual string InputType { get { NotImplemented (); return null; } }
-
-		public virtual bool IsColor { get { NotImplemented (); return false; } }
-
-		public virtual bool IsMobileDevice { get { NotImplemented (); return false; } }
-
-		public virtual string this [string key] {
-			get { throw new NotImplementedException (); }
-		}
-
-		public virtual bool JavaApplets { get { NotImplemented (); return false; } }
-
-		public virtual Version JScriptVersion { get { NotImplemented (); return null; } }
-
-		public virtual int MajorVersion { get { NotImplemented (); return 0; } }
-
-		public virtual int MaximumHrefLength { get { NotImplemented (); return 0; } }
-
-		public virtual int MaximumRenderedPageSize { get { NotImplemented (); return 0; } }
-
-		public virtual int MaximumSoftkeyLabelLength { get { NotImplemented (); return 0; } }
-
-		public virtual double MinorVersion { get { NotImplemented (); return 0; } }
-
-		public virtual string MinorVersionString { get { NotImplemented (); return null; } }
-
-		public virtual string MobileDeviceManufacturer { get { NotImplemented (); return null; } }
-
-		public virtual string MobileDeviceModel { get { NotImplemented (); return null; } }
-
-		public virtual Version MSDomVersion { get { NotImplemented (); return null; } }
-
-		public virtual int NumberOfSoftkeys { get { NotImplemented (); return 0; } }
-
-		public virtual string Platform { get { NotImplemented (); return null; } }
-
-		public virtual string PreferredImageMime { get { NotImplemented (); return null; } }
-
-		public virtual string PreferredRenderingMime { get { NotImplemented (); return null; } }
-
-		public virtual string PreferredRenderingType { get { NotImplemented (); return null; } }
-
-		public virtual string PreferredRequestEncoding { get { NotImplemented (); return null; } }
-
-		public virtual string PreferredResponseEncoding { get { NotImplemented (); return null; } }
-
-		public virtual bool RendersBreakBeforeWmlSelectAndInput { get { NotImplemented (); return false; } }
-
-		public virtual bool RendersBreaksAfterHtmlLists { get { NotImplemented (); return false; } }
-
-		public virtual bool RendersBreaksAfterWmlAnchor { get { NotImplemented (); return false; } }
-
-		public virtual bool RendersBreaksAfterWmlInput { get { NotImplemented (); return false; } }
-
-		public virtual bool RendersWmlDoAcceptsInline { get { NotImplemented (); return false; } }
-
-		public virtual bool RendersWmlSelectsAsMenuCards { get { NotImplemented (); return false; } }
-
-		public virtual string RequiredMetaTagNameValue { get { NotImplemented (); return null; } }
-
-		public virtual bool RequiresAttributeColonSubstitution { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresContentTypeMetaTag { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresControlStateInSession { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresDBCSCharacter { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresHtmlAdaptiveErrorReporting { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresLeadingPageBreak { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresNoBreakInFormatting { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresOutputOptimization { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresPhoneNumbersAsPlainText { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresSpecialViewStateEncoding { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresUniqueFilePathSuffix { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresUniqueHtmlCheckboxNames { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresUniqueHtmlInputNames { get { NotImplemented (); return false; } }
-
-		public virtual bool RequiresUrlEncodedPostfieldValues { get { NotImplemented (); return false; } }
-
-		public virtual int ScreenBitDepth { get { NotImplemented (); return 0; } }
-
-		public virtual int ScreenCharactersHeight { get { NotImplemented (); return 0; } }
-
-		public virtual int ScreenCharactersWidth { get { NotImplemented (); return 0; } }
-
-		public virtual int ScreenPixelsHeight { get { NotImplemented (); return 0; } }
-
-		public virtual int ScreenPixelsWidth { get { NotImplemented (); return 0; } }
-
-		public virtual bool SupportsAccesskeyAttribute { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsBodyColor { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsBold { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsCacheControlMetaTag { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsCallback { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsCss { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsDivAlign { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsDivNoWrap { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsEmptyStringInCookieValue { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsFontColor { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsFontName { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsFontSize { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsImageSubmit { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsIModeSymbols { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsInputIStyle { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsInputMode { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsItalic { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsJPhoneMultiMediaAttributes { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsJPhoneSymbols { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsQueryStringInFormAction { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsRedirectWithCookie { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsSelectMultiple { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsUncheck { get { NotImplemented (); return false; } }
-
-		public virtual bool SupportsXmlHttp { get { NotImplemented (); return false; } }
-
-		public virtual bool Tables { get { NotImplemented (); return false; } }
-
-		public virtual Type TagWriter { get { NotImplemented (); return null; } }
-
-		public virtual string Type { get { NotImplemented (); return null; } }
-
-		public virtual bool UseOptimizedCacheKey { get { NotImplemented (); return false; } }
-
-		public virtual bool VBScript { get { NotImplemented (); return false; } }
-
-		public virtual string Version { get { NotImplemented (); return null; } }
-
-		public virtual Version W3CDomVersion { get { NotImplemented (); return null; } }
-
-		public virtual bool Win16 { get { NotImplemented (); return false; } }
-
-		public virtual bool Win32 { get { NotImplemented (); return false; } }
-
-		public virtual void AddBrowser (string browserName)
-		{
-			NotImplemented ();
-		}
-
-		public virtual int CompareFilters (string filter1, string filter2)
-		{
-			NotImplemented ();
-			return 0;
-		}
-
-		public virtual HtmlTextWriter CreateHtmlTextWriter (TextWriter w)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void DisableOptimizedCacheKey ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual bool EvaluateFilter (string filterName)
-		{
-			NotImplemented ();
-			return false;
-		}
-
-		public virtual Version [] GetClrVersions ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual bool IsBrowser (string browserName)
-		{
-			NotImplemented ();
-			return false;
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs
deleted file mode 100644
index b5cc9638340..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs
+++ /dev/null
@@ -1,548 +0,0 @@
-//
-// HttpBrowserCapabilitiesWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.UI;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpBrowserCapabilitiesWrapper : HttpBrowserCapabilitiesBase
-	{
-		HttpBrowserCapabilities w;
-
-		public HttpBrowserCapabilitiesWrapper (HttpBrowserCapabilities httpBrowserCapabilities)
-		{
-			if (httpBrowserCapabilities == null)
-				throw new ArgumentNullException ("httpBrowserCapabilities");
-			w = httpBrowserCapabilities;
-		}
-
-
-		public override bool ActiveXControls {
-			get { return w.ActiveXControls; }
-		}
-
-		public override IDictionary Adapters {
-			get { return w.Adapters; }
-		}
-
-		public override bool AOL {
-			get { return w.AOL; }
-		}
-
-		public override bool BackgroundSounds {
-			get { return w.BackgroundSounds; }
-		}
-
-		public override bool Beta {
-			get { return w.Beta; }
-		}
-
-		public override string Browser {
-			get { return w.Browser; }
-		}
-
-		public override ArrayList Browsers {
-			get { return w.Browsers; }
-		}
-
-		public override bool CanCombineFormsInDeck {
-			get { return w.CanCombineFormsInDeck; }
-		}
-
-		public override bool CanInitiateVoiceCall {
-			get { return w.CanInitiateVoiceCall; }
-		}
-
-		public override bool CanRenderAfterInputOrSelectElement {
-			get { return w.CanRenderAfterInputOrSelectElement; }
-		}
-
-		public override bool CanRenderEmptySelects {
-			get { return w.CanRenderEmptySelects; }
-		}
-
-		public override bool CanRenderInputAndSelectElementsTogether {
-			get { return w.CanRenderInputAndSelectElementsTogether; }
-		}
-
-		public override bool CanRenderMixedSelects {
-			get { return w.CanRenderMixedSelects; }
-		}
-
-		public override bool CanRenderOneventAndPrevElementsTogether {
-			get { return w.CanRenderOneventAndPrevElementsTogether; }
-		}
-
-		public override bool CanRenderPostBackCards {
-			get { return w.CanRenderPostBackCards; }
-		}
-
-		public override bool CanRenderSetvarZeroWithMultiSelectionList {
-			get { return w.CanRenderSetvarZeroWithMultiSelectionList; }
-		}
-
-		public override bool CanSendMail {
-			get { return w.CanSendMail; }
-		}
-
-		public override IDictionary Capabilities {
-			get { return w.Capabilities; } set { w.Capabilities = value; }
-		}
-
-		public override bool CDF {
-			get { return w.CDF; }
-		}
-
-		public override Version ClrVersion {
-			get { return w.ClrVersion; }
-		}
-
-		public override bool Cookies {
-			get { return w.Cookies; }
-		}
-
-		public override bool Crawler {
-			get { return w.Crawler; }
-		}
-
-		public override int DefaultSubmitButtonLimit {
-			get { return w.DefaultSubmitButtonLimit; }
-		}
-
-		public override Version EcmaScriptVersion {
-			get { return w.EcmaScriptVersion; }
-		}
-
-		public override bool Frames {
-			get { return w.Frames; }
-		}
-
-		public override int GatewayMajorVersion {
-			get { return w.GatewayMajorVersion; }
-		}
-
-		public override double GatewayMinorVersion {
-			get { return w.GatewayMinorVersion; }
-		}
-
-		public override string GatewayVersion {
-			get { return w.GatewayVersion; }
-		}
-
-		public override bool HasBackButton {
-			get { return w.HasBackButton; }
-		}
-
-		public override bool HidesRightAlignedMultiselectScrollbars {
-			get { return w.HidesRightAlignedMultiselectScrollbars; }
-		}
-
-		public override string HtmlTextWriter {
-			get { return w.HtmlTextWriter; } set { w.HtmlTextWriter = value; }
-		}
-
-		public override string Id {
-			get { return w.Id; }
-		}
-
-		public override string InputType {
-			get { return w.InputType; }
-		}
-
-		public override bool IsColor {
-			get { return w.IsColor; }
-		}
-
-		public override bool IsMobileDevice {
-			get { return w.IsMobileDevice; }
-		}
-
-		public override string this [string key] {
-			get { throw new NotImplementedException (); }
-		}
-
-		public override bool JavaApplets {
-			get { return w.JavaApplets; }
-		}
-
-		public override Version JScriptVersion {
-			get { return w.JScriptVersion; }
-		}
-
-		public override int MajorVersion {
-			get { return w.MajorVersion; }
-		}
-
-		public override int MaximumHrefLength {
-			get { return w.MaximumHrefLength; }
-		}
-
-		public override int MaximumRenderedPageSize {
-			get { return w.MaximumRenderedPageSize; }
-		}
-
-		public override int MaximumSoftkeyLabelLength {
-			get { return w.MaximumSoftkeyLabelLength; }
-		}
-
-		public override double MinorVersion {
-			get { return w.MinorVersion; }
-		}
-
-		public override string MinorVersionString {
-			get { return w.MinorVersionString; }
-		}
-
-		public override string MobileDeviceManufacturer {
-			get { return w.MobileDeviceManufacturer; }
-		}
-
-		public override string MobileDeviceModel {
-			get { return w.MobileDeviceModel; }
-		}
-
-		public override Version MSDomVersion {
-			get { return w.MSDomVersion; }
-		}
-
-		public override int NumberOfSoftkeys {
-			get { return w.NumberOfSoftkeys; }
-		}
-
-		public override string Platform {
-			get { return w.Platform; }
-		}
-
-		public override string PreferredImageMime {
-			get { return w.PreferredImageMime; }
-		}
-
-		public override string PreferredRenderingMime {
-			get { return w.PreferredRenderingMime; }
-		}
-
-		public override string PreferredRenderingType {
-			get { return w.PreferredRenderingType; }
-		}
-
-		public override string PreferredRequestEncoding {
-			get { return w.PreferredRequestEncoding; }
-		}
-
-		public override string PreferredResponseEncoding {
-			get { return w.PreferredResponseEncoding; }
-		}
-
-		public override bool RendersBreakBeforeWmlSelectAndInput {
-			get { return w.RendersBreakBeforeWmlSelectAndInput; }
-		}
-
-		public override bool RendersBreaksAfterHtmlLists {
-			get { return w.RendersBreaksAfterHtmlLists; }
-		}
-
-		public override bool RendersBreaksAfterWmlAnchor {
-			get { return w.RendersBreaksAfterWmlAnchor; }
-		}
-
-		public override bool RendersBreaksAfterWmlInput {
-			get { return w.RendersBreaksAfterWmlInput; }
-		}
-
-		public override bool RendersWmlDoAcceptsInline {
-			get { return w.RendersWmlDoAcceptsInline; }
-		}
-
-		public override bool RendersWmlSelectsAsMenuCards {
-			get { return w.RendersWmlSelectsAsMenuCards; }
-		}
-
-		public override string RequiredMetaTagNameValue {
-			get { return w.RequiredMetaTagNameValue; }
-		}
-
-		public override bool RequiresAttributeColonSubstitution {
-			get { return w.RequiresAttributeColonSubstitution; }
-		}
-
-		public override bool RequiresContentTypeMetaTag {
-			get { return w.RequiresContentTypeMetaTag; }
-		}
-
-		public override bool RequiresControlStateInSession {
-			get { return w.RequiresControlStateInSession; }
-		}
-
-		public override bool RequiresDBCSCharacter {
-			get { return w.RequiresDBCSCharacter; }
-		}
-
-		public override bool RequiresHtmlAdaptiveErrorReporting {
-			get { return w.RequiresHtmlAdaptiveErrorReporting; }
-		}
-
-		public override bool RequiresLeadingPageBreak {
-			get { return w.RequiresLeadingPageBreak; }
-		}
-
-		public override bool RequiresNoBreakInFormatting {
-			get { return w.RequiresNoBreakInFormatting; }
-		}
-
-		public override bool RequiresOutputOptimization {
-			get { return w.RequiresOutputOptimization; }
-		}
-
-		public override bool RequiresPhoneNumbersAsPlainText {
-			get { return w.RequiresPhoneNumbersAsPlainText; }
-		}
-
-		public override bool RequiresSpecialViewStateEncoding {
-			get { return w.RequiresSpecialViewStateEncoding; }
-		}
-
-		public override bool RequiresUniqueFilePathSuffix {
-			get { return w.RequiresUniqueFilePathSuffix; }
-		}
-
-		public override bool RequiresUniqueHtmlCheckboxNames {
-			get { return w.RequiresUniqueHtmlCheckboxNames; }
-		}
-
-		public override bool RequiresUniqueHtmlInputNames {
-			get { return w.RequiresUniqueHtmlInputNames; }
-		}
-
-		public override bool RequiresUrlEncodedPostfieldValues {
-			get { return w.RequiresUrlEncodedPostfieldValues; }
-		}
-
-		public override int ScreenBitDepth {
-			get { return w.ScreenBitDepth; }
-		}
-
-		public override int ScreenCharactersHeight {
-			get { return w.ScreenCharactersHeight; }
-		}
-
-		public override int ScreenCharactersWidth {
-			get { return w.ScreenCharactersWidth; }
-		}
-
-		public override int ScreenPixelsHeight {
-			get { return w.ScreenPixelsHeight; }
-		}
-
-		public override int ScreenPixelsWidth {
-			get { return w.ScreenPixelsWidth; }
-		}
-
-		public override bool SupportsAccesskeyAttribute {
-			get { return w.SupportsAccesskeyAttribute; }
-		}
-
-		public override bool SupportsBodyColor {
-			get { return w.SupportsBodyColor; }
-		}
-
-		public override bool SupportsBold {
-			get { return w.SupportsBold; }
-		}
-
-		public override bool SupportsCacheControlMetaTag {
-			get { return w.SupportsCacheControlMetaTag; }
-		}
-
-		public override bool SupportsCallback {
-			get { return w.SupportsCallback; }
-		}
-
-		public override bool SupportsCss {
-			get { return w.SupportsCss; }
-		}
-
-		public override bool SupportsDivAlign {
-			get { return w.SupportsDivAlign; }
-		}
-
-		public override bool SupportsDivNoWrap {
-			get { return w.SupportsDivNoWrap; }
-		}
-
-		public override bool SupportsEmptyStringInCookieValue {
-			get { return w.SupportsEmptyStringInCookieValue; }
-		}
-
-		public override bool SupportsFontColor {
-			get { return w.SupportsFontColor; }
-		}
-
-		public override bool SupportsFontName {
-			get { return w.SupportsFontName; }
-		}
-
-		public override bool SupportsFontSize {
-			get { return w.SupportsFontSize; }
-		}
-
-		public override bool SupportsImageSubmit {
-			get { return w.SupportsImageSubmit; }
-		}
-
-		public override bool SupportsIModeSymbols {
-			get { return w.SupportsIModeSymbols; }
-		}
-
-		public override bool SupportsInputIStyle {
-			get { return w.SupportsInputIStyle; }
-		}
-
-		public override bool SupportsInputMode {
-			get { return w.SupportsInputMode; }
-		}
-
-		public override bool SupportsItalic {
-			get { return w.SupportsItalic; }
-		}
-
-		public override bool SupportsJPhoneMultiMediaAttributes {
-			get { return w.SupportsJPhoneMultiMediaAttributes; }
-		}
-
-		public override bool SupportsJPhoneSymbols {
-			get { return w.SupportsJPhoneSymbols; }
-		}
-
-		public override bool SupportsQueryStringInFormAction {
-			get { return w.SupportsQueryStringInFormAction; }
-		}
-
-		public override bool SupportsRedirectWithCookie {
-			get { return w.SupportsRedirectWithCookie; }
-		}
-
-		public override bool SupportsSelectMultiple {
-			get { return w.SupportsSelectMultiple; }
-		}
-
-		public override bool SupportsUncheck {
-			get { return w.SupportsUncheck; }
-		}
-
-		public override bool SupportsXmlHttp {
-			get { return w.SupportsXmlHttp; }
-		}
-
-		public override bool Tables {
-			get { return w.Tables; }
-		}
-
-		public override Type TagWriter {
-			get { return w.TagWriter; }
-		}
-
-		public override string Type {
-			get { return w.Type; }
-		}
-
-		public override bool UseOptimizedCacheKey {
-			get { return w.UseOptimizedCacheKey; }
-		}
-
-		public override bool VBScript {
-			get { return w.VBScript; }
-		}
-
-		public override string Version {
-			get { return w.Version; }
-		}
-
-		public override Version W3CDomVersion {
-			get { return w.W3CDomVersion; }
-		}
-
-		public override bool Win16 {
-			get { return w.Win16; }
-		}
-
-		public override bool Win32 {
-			get { return w.Win32; }
-		}
-
-		public override void AddBrowser (string browserName)
-		{
-			w.AddBrowser (browserName);
-		}
-
-		[MonoTODO]
-		public override int CompareFilters (string filter1, string filter2)
-		{
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override HtmlTextWriter CreateHtmlTextWriter (TextWriter w)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override void DisableOptimizedCacheKey ()
-		{
-			w.DisableOptimizedCacheKey ();
-		}
-
-		[MonoTODO]
-		public override bool EvaluateFilter (string filterName)
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override Version [] GetClrVersions ()
-		{
-			return w.GetClrVersions ();
-		}
-
-		public override bool IsBrowser (string browserName)
-		{
-			return w.IsBrowser (browserName);
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs
deleted file mode 100644
index 70084749325..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// HttpCachePolicyBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpCachePolicyBase
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual HttpCacheVaryByContentEncodings VaryByContentEncodings { get { NotImplemented (); return null; } }
-
-		public virtual HttpCacheVaryByHeaders VaryByHeaders { get { NotImplemented (); return null; } }
-
-		public virtual HttpCacheVaryByParams VaryByParams { get { NotImplemented (); return null; } }
-
-		public virtual void AddValidationCallback (HttpCacheValidateHandler handler, object data)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void AppendCacheExtension (string extension)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetAllowResponseInBrowserHistory (bool allow)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetCacheability (HttpCacheability cacheability)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetCacheability (HttpCacheability cacheability, string field)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetETag (string etag)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetETagFromFileDependencies ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetExpires (DateTime date)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetLastModified (DateTime date)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetLastModifiedFromFileDependencies ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetMaxAge (TimeSpan delta)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetNoServerCaching ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetNoStore ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetNoTransforms ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetOmitVaryStar (bool omit)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetProxyMaxAge (TimeSpan delta)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetRevalidation (HttpCacheRevalidation revalidation)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetSlidingExpiration (bool slide)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetValidUntilExpires (bool validUntilExpires)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void SetVaryByCustom (string custom)
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs
deleted file mode 100644
index c2fad9de494..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// HttpCachePolicyWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpCachePolicyWrapper : HttpCachePolicyBase
-	{
-		HttpCachePolicy w;
-
-		public HttpCachePolicyWrapper (HttpCachePolicy httpCachePolicy)
-		{
-			if (httpCachePolicy == null)
-				throw new ArgumentNullException ("httpCachePolicy");
-			w = httpCachePolicy;
-		}
-
-		public override HttpCacheVaryByContentEncodings VaryByContentEncodings {
-			get { return w.VaryByContentEncodings; }
-		}
-
-		public override HttpCacheVaryByHeaders VaryByHeaders {
-			get { return w.VaryByHeaders; }
-		}
-
-		public override HttpCacheVaryByParams VaryByParams {
-			get { return w.VaryByParams; }
-		}
-
-		public override void AddValidationCallback (HttpCacheValidateHandler handler, object data)
-		{
-			w.AddValidationCallback (handler, data);
-		}
-
-		public override void AppendCacheExtension (string extension)
-		{
-			w.AppendCacheExtension (extension);
-		}
-
-		public override void SetAllowResponseInBrowserHistory (bool allow)
-		{
-			w.SetAllowResponseInBrowserHistory (allow);
-		}
-
-		public override void SetCacheability (HttpCacheability cacheability)
-		{
-			w.SetCacheability (cacheability);
-		}
-
-		public override void SetCacheability (HttpCacheability cacheability, string field)
-		{
-			w.SetCacheability (cacheability, field);
-		}
-
-		public override void SetVaryByCustom (string custom)
-		{
-			w.SetVaryByCustom (custom);
-		}
-
-		public override void SetETag (string etag)
-		{
-			w.SetETag (etag);
-		}
-
-		public override void SetETagFromFileDependencies ()
-		{
-			w.SetETagFromFileDependencies ();
-		}
-
-		public override void SetExpires (DateTime date)
-		{
-			w.SetExpires (date);
-		}
-
-		public override void SetLastModified (DateTime date)
-		{
-			w.SetLastModified (date);
-		}
-
-		public override void SetLastModifiedFromFileDependencies ()
-		{
-			w.SetLastModifiedFromFileDependencies ();
-		}
-
-		public override void SetMaxAge (TimeSpan delta)
-		{
-			w.SetMaxAge (delta);
-		}
-
-		public override void SetNoServerCaching ()
-		{
-			w.SetNoServerCaching ();
-		}
-
-		public override void SetNoStore ()
-		{
-			w.SetNoStore ();
-		}
-
-		public override void SetNoTransforms ()
-		{
-			w.SetNoTransforms ();
-		}
-
-		public override void SetOmitVaryStar (bool omit)
-		{
-			w.SetOmitVaryStar (omit);
-		}
-
-		public override void SetProxyMaxAge (TimeSpan delta)
-		{
-			w.SetProxyMaxAge (delta);
-		}
-
-		public override void SetRevalidation (HttpCacheRevalidation revalidation)
-		{
-			w.SetRevalidation (revalidation);
-		}
-
-		public override void SetSlidingExpiration (bool slide)
-		{
-			w.SetSlidingExpiration (slide);
-		}
-
-		public override void SetValidUntilExpires (bool validUntilExpires)
-		{
-			w.SetValidUntilExpires (validUntilExpires);
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs
deleted file mode 100644
index f81db297f8d..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-// HttpContextBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.Profile;
-using System.Web.SessionState;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpContextBase : IServiceProvider
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual Exception [] AllErrors { get { NotImplemented (); return null; } }
-
-		public virtual HttpApplicationStateBase Application { get { NotImplemented (); return null; } }
-
-		public virtual HttpApplication ApplicationInstance { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual Cache Cache { get { NotImplemented (); return null; } }
-
-		public virtual IHttpHandler CurrentHandler { get { NotImplemented (); return null; } }
-
-		public virtual RequestNotification CurrentNotification { get { NotImplemented (); return default (RequestNotification); } }
-
-		public virtual Exception Error { get { NotImplemented (); return null; } }
-
-		public virtual IHttpHandler Handler { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual bool IsCustomErrorEnabled { get { NotImplemented (); return false; } }
-
-		public virtual bool IsDebuggingEnabled { get { NotImplemented (); return false; } }
-
-		public virtual bool IsPostNotification { get { NotImplemented (); return false; } }
-
-		public virtual IDictionary Items { get { NotImplemented (); return null; } }
-
-		public virtual IHttpHandler PreviousHandler { get { NotImplemented (); return null; } }
-
-		public virtual ProfileBase Profile { get { NotImplemented (); return null; } }
-
-		public virtual HttpRequestBase Request { get { NotImplemented (); return null; } }
-
-		public virtual HttpResponseBase Response { get { NotImplemented (); return null; } }
-
-		public virtual HttpServerUtilityBase Server { get { NotImplemented (); return null; } }
-
-		public virtual HttpSessionStateBase Session { get { NotImplemented (); return null; } }
-
-		public virtual bool SkipAuthorization { get { NotImplemented (); return false; } set { NotImplemented (); } }
-
-		public virtual DateTime Timestamp { get { NotImplemented (); return DateTime.MinValue; } }
-
-		public virtual TraceContext Trace { get { NotImplemented (); return null; } }
-
-		public virtual IPrincipal User { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual void AddError (Exception errorInfo)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void ClearError ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual object GetGlobalResourceObject (string classKey, string resourceKey)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object GetGlobalResourceObject (string classKey, string resourceKey, CultureInfo culture)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object GetLocalResourceObject (string virtualPath, string resourceKey)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object GetLocalResourceObject (string virtualPath, string resourceKey, CultureInfo culture)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object GetSection (string sectionName)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object GetService (Type serviceType)
-		{
-			NotImplemented ();
-			return null;
-		}
-		public virtual void RemapHandler (IHttpHandler handler)
-		{
-			NotImplemented ();
-		}
-		public virtual void RewritePath (string path)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RewritePath (string path, bool rebaseClientPath)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RewritePath (string filePath, string pathInfo, string queryString)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RewritePath (string filePath, string pathInfo, string queryString, bool setClientFilePath)
-		{
-			NotImplemented ();
-		}
-		public virtual void SetSessionStateBehavior (SessionStateBehavior sessionStateBehavior)
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
deleted file mode 100644
index 64975a813c0..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-//
-// HttpContextWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008-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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.Profile;
-using System.Web.SessionState;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpContextWrapper : HttpContextBase
-	{
-		HttpContext w;
-
-		public HttpContextWrapper (HttpContext httpContext)
-		{
-			if (httpContext == null)
-				throw new ArgumentNullException ("httpContext");
-			w = httpContext;
-		}
-
-		public override Exception [] AllErrors {
-			get { return w.AllErrors; }
-		}
-
-		public override HttpApplicationStateBase Application {
-			get { return new HttpApplicationStateWrapper (w.Application); }
-		}
-
-		public override HttpApplication ApplicationInstance {
-			get { return w.ApplicationInstance; }
-			set { w.ApplicationInstance = value; }
-		}
-
-		public override Cache Cache {
-			get { return w.Cache; }
-		}
-
-		public override IHttpHandler CurrentHandler {
-			get { return w.CurrentHandler; }
-		}
-
-		public override RequestNotification CurrentNotification {
-			get { return w.CurrentNotification; }
-		}
-
-		public override Exception Error {
-			get { return w.Error; }
-		}
-
-		public override IHttpHandler Handler {
-			get { return w.Handler; }
-			set { w.Handler = value; }
-		}
-
-		public override bool IsCustomErrorEnabled {
-			get { return w.IsCustomErrorEnabled; }
-		}
-
-		public override bool IsDebuggingEnabled {
-			get { return w.IsDebuggingEnabled; }
-		}
-
-		public override bool IsPostNotification {
-			get { return w.IsPostNotification; }
-		}
-
-		public override IDictionary Items {
-			get { return w.Items; }
-		}
-
-		public override IHttpHandler PreviousHandler {
-			get { return w.PreviousHandler; }
-		}
-
-		public override ProfileBase Profile {
-			get { return w.Profile; }
-		}
-
-		public override HttpRequestBase Request {
-			get { return new HttpRequestWrapper (w.Request); }
-		}
-
-		public override HttpResponseBase Response {
-			get { return new HttpResponseWrapper (w.Response); }
-		}
-
-		public override HttpServerUtilityBase Server {
-			get { return new HttpServerUtilityWrapper (w.Server); }
-		}
-
-		public override HttpSessionStateBase Session {
-			get { return w.Session == null ? null : new HttpSessionStateWrapper (w.Session); }
-		}
-
-		public override bool SkipAuthorization {
-			get { return w.SkipAuthorization; }
-			set { w.SkipAuthorization = value; }
-		}
-
-		public override DateTime Timestamp {
-			get { return w.Timestamp; }
-		}
-
-		public override TraceContext Trace {
-			get { return w.Trace; }
-		}
-
-		public override IPrincipal User {
-			get { return w.User; }
-			set { w.User = value; }
-		}
-
-		public override void AddError (Exception errorInfo)
-		{
-			w.AddError (errorInfo);
-		}
-
-		public override void ClearError ()
-		{
-			w.ClearError ();
-		}
-
-		public override object GetGlobalResourceObject (string classKey, string resourceKey)
-		{
-			return HttpContext.GetGlobalResourceObject (classKey, resourceKey);
-		}
-
-		public override object GetGlobalResourceObject (string classKey, string resourceKey, CultureInfo culture)
-		{
-			return HttpContext.GetGlobalResourceObject (classKey, resourceKey, culture);
-		}
-
-		public override object GetLocalResourceObject (string overridePath, string resourceKey)
-		{
-			return HttpContext.GetLocalResourceObject (overridePath, resourceKey);
-		}
-
-		public override object GetLocalResourceObject (string overridePath, string resourceKey, CultureInfo culture)
-		{
-			return HttpContext.GetLocalResourceObject (overridePath, resourceKey, culture);
-		}
-
-		public override object GetSection (string sectionName)
-		{
-			return w.GetSection (sectionName);
-		}
-
-		public override object GetService (Type serviceType)
-		{
-			return ((IServiceProvider)w).GetService (serviceType);
-		}
-		public override void RemapHandler (IHttpHandler handler)
-		{
-			w.RemapHandler (handler);
-		}
-		public override void RewritePath (string path)
-		{
-			w.RewritePath (path);
-		}
-
-		public override void RewritePath (string path, bool rebaseClientPath)
-		{
-			w.RewritePath (path, rebaseClientPath);
-		}
-
-		public override void RewritePath (string filePath, string pathInfo, string queryString)
-		{
-			w.RewritePath (filePath, pathInfo, queryString);
-		}
-
-		public override void RewritePath (string filePath, string pathInfo, string queryString, bool setClientFilePath)
-		{
-			w.RewritePath (filePath, pathInfo, queryString, setClientFilePath);
-		}
-		public override void SetSessionStateBehavior (SessionStateBehavior sessionStateBehavior)
-		{
-			w.SetSessionStateBehavior (sessionStateBehavior);
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs
deleted file mode 100644
index bd8c126723d..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// HttpFileCollectionBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpFileCollectionBase : NameObjectCollectionBase, ICollection, IEnumerable
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual string [] AllKeys { get { NotImplemented (); return null; } }
-
-		public override int Count {
-			get { NotImplemented (); return 0; }
-		}
-
-		public virtual bool IsSynchronized { get { NotImplemented (); return false; } }
-
-		public virtual HttpPostedFileBase this [int index] {
-			get { return Get (index); }
-		}
-
-		public virtual HttpPostedFileBase this [string name] {
-			get { return Get (name); }
-		}
-
-		public virtual object SyncRoot { get { NotImplemented (); return null; } }
-
-		public virtual void CopyTo (Array dest, int index)
-		{
-			NotImplemented ();
-		}
-
-		public virtual HttpPostedFileBase Get (int index)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual HttpPostedFileBase Get (string name)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual string GetKey (int index)
-		{
-			NotImplemented ();
-			return null;
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs
deleted file mode 100644
index 4c7c919d1e4..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// HttpFileCollectionWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpFileCollectionWrapper : HttpFileCollectionBase
-	{
-		HttpFileCollection w;
-
-		public HttpFileCollectionWrapper (HttpFileCollection httpFileCollection)
-		{
-			if (httpFileCollection == null)
-				throw new ArgumentNullException ("httpFileCollection");
-			w = httpFileCollection;
-		}
-
-		public override string [] AllKeys {
-			get { return w.AllKeys; }
-		}
-
-		public override int Count {
-			get { return w.Count; }
-		}
-
-		public override bool IsSynchronized {
-			get { return ((ICollection) w).IsSynchronized; }
-		}
-
-		public override HttpPostedFileBase this [int index] {
-			get { return Get (index); }
-		}
-
-		public override HttpPostedFileBase this [string name] {
-			get { return Get (name); }
-		}
-
-		public override NameObjectCollectionBase.KeysCollection Keys {
-			get { return w.Keys; }
-		}
-
-		public override object SyncRoot {
-			get { return ((ICollection) w).SyncRoot; }
-		}
-
-		public override void CopyTo (Array dest, int index)
-		{
-			w.CopyTo (dest, index);
-		}
-
-		public override HttpPostedFileBase Get (int index)
-		{
-			HttpPostedFile file = w.Get (index);
-			if (file == null)
-				return null;
-
-			return new HttpPostedFileWrapper (file);
-		}
-
-		public override HttpPostedFileBase Get (string name)
-		{
-			HttpPostedFile file = w.Get (name);
-			if (file == null)
-				return null;
-
-			return new HttpPostedFileWrapper (file);
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			return w.GetEnumerator ();
-		}
-
-		public override string GetKey (int index)
-		{
-			return w.GetKey (index);
-		}
-
-		public override void GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			w.GetObjectData (info, context);
-		}
-
-		public override void OnDeserialization (object sender)
-		{
-			w.OnDeserialization (sender);
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs
deleted file mode 100644
index d5a783b8d09..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// HttpPostedFileBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpPostedFileBase
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual int ContentLength { get { NotImplemented (); return 0; } }
-
-		public virtual string ContentType { get { NotImplemented (); return null; } }
-
-		public virtual string FileName { get { NotImplemented (); return null; } }
-
-		public virtual Stream InputStream { get { NotImplemented (); return null; } }
-
-		public virtual void SaveAs (string filename)
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs
deleted file mode 100644
index 247b53866a8..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// HttpPostedFileWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpPostedFileWrapper : HttpPostedFileBase
-	{
-		HttpPostedFile w;
-
-		public HttpPostedFileWrapper (HttpPostedFile httpPostedFile)
-		{
-			if (httpPostedFile == null)
-				throw new ArgumentNullException ("httpPostedFile");
-			w = httpPostedFile;
-		}
-
-		public override int ContentLength {
-			get { return w.ContentLength; }
-		}
-
-		public override string ContentType {
-			get { return w.ContentType; }
-		}
-
-		public override string FileName {
-			get { return w.FileName; }
-		}
-
-		public override Stream InputStream {
-			get { return w.InputStream; }
-		}
-
-		public override void SaveAs (string filename)
-		{
-			w.SaveAs (filename);
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
deleted file mode 100644
index a7b601487f1..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-//
-// HttpRequestBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Text;
-using System.Threading;
-using System.Web.Caching;
-
-using System.Security.Authentication.ExtendedProtection;
-using System.Web.Routing;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpRequestBase
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual string [] AcceptTypes { get { NotImplemented (); return null; } }
-
-		public virtual string AnonymousID { get { NotImplemented (); return null; } }
-
-		public virtual string ApplicationPath { get { NotImplemented (); return null; } }
-
-		public virtual string AppRelativeCurrentExecutionFilePath { get { NotImplemented (); return null; } }
-
-		public virtual HttpBrowserCapabilitiesBase Browser { get { NotImplemented (); return null; } }
-
-		public virtual HttpClientCertificate ClientCertificate { get { NotImplemented (); return null; } }
-
-		public virtual Encoding ContentEncoding { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual int ContentLength { get { NotImplemented (); return 0; } }
-
-		public virtual string ContentType { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual HttpCookieCollection Cookies { get { NotImplemented (); return null; } }
-
-		public virtual string CurrentExecutionFilePath { get { NotImplemented (); return null; } }
-
-		public virtual string CurrentExecutionFilePathExtension { get { NotImplemented (); return null; } }
-
-		public virtual string FilePath { get { NotImplemented (); return null; } }
-
-		public virtual HttpFileCollectionBase Files { get { NotImplemented (); return null; } }
-
-		public virtual Stream Filter { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual NameValueCollection Form { get { NotImplemented (); return null; } }
-
-		public virtual NameValueCollection Headers { get { NotImplemented (); return null; } }
-
-		public virtual string HttpMethod { get { NotImplemented (); return null; } }
-
-		public virtual Stream InputStream { get { NotImplemented (); return null; } }
-		// LAMESPEC: MSDN says NotImplementedException is thrown only when the request is
-		// not IIS7WorkerRequest or ISAPIWorkerRequestInProc, but it is thrown always.
-		public virtual ChannelBinding HttpChannelBinding { get { NotImplemented (); return null; } }
-		public virtual bool IsAuthenticated { get { NotImplemented (); return false; } }
-
-		public virtual bool IsLocal { get { NotImplemented (); return false; } }
-
-		public virtual bool IsSecureConnection { get { NotImplemented (); return false; } }
-
-		public virtual string this [string key] {
-			get { throw new NotImplementedException (); }
-		}
-
-		public virtual WindowsIdentity LogonUserIdentity { get { NotImplemented (); return null; } }
-
-		public virtual NameValueCollection Params { get { NotImplemented (); return null; } }
-
-		public virtual string Path { get { NotImplemented (); return null; } }
-
-		public virtual string PathInfo { get { NotImplemented (); return null; } }
-
-		public virtual string PhysicalApplicationPath { get { NotImplemented (); return null; } }
-
-		public virtual string PhysicalPath { get { NotImplemented (); return null; } }
-
-		public virtual NameValueCollection QueryString { get { NotImplemented (); return null; } }
-
-		public virtual string RawUrl { get { NotImplemented (); return null; } }
-
-		public virtual string RequestType { get { NotImplemented (); return null; } set { NotImplemented (); } }
-		public virtual RequestContext RequestContext {
-			get { NotImplemented (); return null; } 
-			internal set { NotImplemented (); }
-		}
-		public virtual NameValueCollection ServerVariables { get { NotImplemented (); return null; } }
-
-		public virtual CancellationToken TimedOutToken { get { NotImplemented (); return default(CancellationToken); } }
-
-		public virtual int TotalBytes { get { NotImplemented (); return 0; } }
-
-		public virtual ReadEntityBodyMode ReadEntityBodyMode { get { NotImplemented(); return ReadEntityBodyMode.Classic; } }
-
-		public virtual UnvalidatedRequestValuesBase Unvalidated { get { NotImplemented (); return null; } }
-
-		public virtual Uri Url { get { NotImplemented (); return null; } }
-
-		public virtual Uri UrlReferrer { get { NotImplemented (); return null; } }
-
-		public virtual string UserAgent { get { NotImplemented (); return null; } }
-
-		public virtual string UserHostAddress { get { NotImplemented (); return null; } }
-
-		public virtual string UserHostName { get { NotImplemented (); return null; } }
-
-		public virtual string [] UserLanguages { get { NotImplemented (); return null; } }
-
-		public virtual void Abort ()
-		{
-			NotImplemented();
-		}
-
-		public virtual byte [] BinaryRead (int count)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual Stream GetBufferedInputStream ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual Stream GetBufferlessInputStream ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual Stream GetBufferlessInputStream (bool disableMaxRequestLength)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void InsertEntityBody()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void InsertEntityBody(byte[] buffer, int offset, int count)
-		{
-			NotImplemented ();
-		}
-
-		public virtual double [] MapRawImageCoordinates (string imageFieldName)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual int [] MapImageCoordinates (string imageFieldName)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual string MapPath (string virtualPath)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual string MapPath (string virtualPath, string baseVirtualDir, bool allowCrossAppMapping)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void SaveAs (string filename, bool includeHeaders)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void ValidateInput ()
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
deleted file mode 100644
index 4b512c71d5c..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-//
-// HttpRequestWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Text;
-using System.Threading;
-using System.Web.Caching;
-
-using System.Security.Authentication.ExtendedProtection;
-using System.Web.Routing;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpRequestWrapper : HttpRequestBase
-	{
-		HttpRequest w;
-
-		public HttpRequestWrapper (HttpRequest httpRequest)
-		{
-			if (httpRequest == null)
-				throw new ArgumentNullException ("httpRequest");
-			w = httpRequest;
-		}
-
-		public override string [] AcceptTypes {
-			get { return w.AcceptTypes; }
-		}
-
-		public override string AnonymousID {
-			get { return w.AnonymousID; }
-		}
-
-		public override string ApplicationPath {
-			get { return w.ApplicationPath; }
-		}
-
-		public override string AppRelativeCurrentExecutionFilePath {
-			get { return w.AppRelativeCurrentExecutionFilePath; }
-		}
-
-		public override HttpBrowserCapabilitiesBase Browser {
-			get { return new HttpBrowserCapabilitiesWrapper (w.Browser); }
-		}
-
-		public override HttpClientCertificate ClientCertificate {
-			get { return w.ClientCertificate; }
-		}
-
-		public override Encoding ContentEncoding {
-			get { return w.ContentEncoding; }
-			set { w.ContentEncoding = value; }
-		}
-
-		public override int ContentLength {
-			get { return w.ContentLength; }
-		}
-
-		public override string ContentType {
-			get { return w.ContentType; }
-			set { w.ContentType = value; }
-		}
-
-		public override HttpCookieCollection Cookies {
-			get { return w.Cookies; }
-		}
-
-		public override string CurrentExecutionFilePath {
-			get { return w.CurrentExecutionFilePath; }
-		}
-
-		public override string FilePath {
-			get { return w.FilePath; }
-		}
-
-		public override HttpFileCollectionBase Files {
-			get { return new HttpFileCollectionWrapper (w.Files); }
-		}
-
-		public override Stream Filter {
-			get { return w.Filter; }
-			set { w.Filter = value; }
-		}
-
-		public override NameValueCollection Form {
-			get { return w.Form; }
-		}
-
-		public override NameValueCollection Headers {
-			get { return w.Headers; }
-		}
-
-		public override Stream GetBufferedInputStream ()
-		{
-			return w.GetBufferedInputStream ();
-		}
-
-		public override Stream GetBufferlessInputStream ()
-		{
-			return w.GetBufferlessInputStream ();
-		}
-
-		public override Stream GetBufferlessInputStream (System.Boolean disableMaxRequestLength)
-		{
-			return w.GetBufferlessInputStream (disableMaxRequestLength);
-		}
-
-		public override string HttpMethod {
-			get { return w.HttpMethod; }
-		}
-		public override ChannelBinding HttpChannelBinding {
-			get { return w.HttpChannelBinding; }
-		}
-		public override Stream InputStream {
-			get { return w.InputStream; }
-		}
-
-		public override bool IsAuthenticated {
-			get { return w.IsAuthenticated; }
-		}
-
-		public override bool IsLocal {
-			get { return w.IsLocal; }
-		}
-
-		public override bool IsSecureConnection {
-			get { return w.IsSecureConnection; }
-		}
-
-		public override string this [string key] {
-			get { return w [key]; }
-		}
-
-		public override WindowsIdentity LogonUserIdentity {
-			get { return w.LogonUserIdentity; }
-		}
-
-		public override NameValueCollection Params {
-			get { return w.Params; }
-		}
-
-		public override string Path {
-			get { return w.Path; }
-		}
-
-		public override string PathInfo {
-			get { return w.PathInfo; }
-		}
-
-		public override string PhysicalApplicationPath {
-			get { return w.PhysicalApplicationPath; }
-		}
-
-		public override string PhysicalPath {
-			get { return w.PhysicalPath; }
-		}
-
-		public override NameValueCollection QueryString {
-			get { return w.QueryString; }
-		}
-
-		public override string RawUrl {
-			get { return w.RawUrl; }
-		}
-
-		public override string RequestType {
-			get { return w.RequestType; }
-			set { w.RequestType = value; }
-		}
-		public override RequestContext RequestContext {
-			get { return w.RequestContext; }
-			internal set { w.RequestContext = value; }	
-		}
-		public override NameValueCollection ServerVariables {
-			get { return w.ServerVariables; }
-		}
-
-		public virtual CancellationToken TimedOutToken {
-			get { return w.TimedOutToken; }
-		}
-
-		public override int TotalBytes {
-			get { return w.TotalBytes; }
-		}
-
-		public override UnvalidatedRequestValuesBase Unvalidated { 
-			get { return new UnvalidatedRequestValuesWrapper (w.Unvalidated); } 
-		}
-
-		public override ReadEntityBodyMode ReadEntityBodyMode {
-			get { return ReadEntityBodyMode.Classic; }
-		}
-
-		public override Uri Url {
-			get { return w.Url; }
-		}
-
-		public override Uri UrlReferrer {
-			get { return w.UrlReferrer; }
-		}
-
-		public override string UserAgent {
-			get { return w.UserAgent; }
-		}
-
-		public override string UserHostAddress {
-			get { return w.UserHostAddress; }
-		}
-
-		public override string UserHostName {
-			get { return w.UserHostName; }
-		}
-
-		public override string [] UserLanguages {
-			get { return w.UserLanguages; }
-		}
-
-		public void Abort ()
-		{
-			w.WorkerRequest.CloseConnection();
-		}
-
-		public override byte [] BinaryRead (int count)
-		{
-			return w.BinaryRead (count);
-		}
-
-		public override int [] MapImageCoordinates (string imageFieldName)
-		{
-			return w.MapImageCoordinates (imageFieldName);
-		}
-
-		public override string MapPath (string virtualPath)
-		{
-			return w.MapPath (virtualPath);
-		}
-
-		public override string MapPath (string virtualPath, string baseVirtualDir, bool allowCrossAppMapping)
-		{
-			return w.MapPath (virtualPath, baseVirtualDir, allowCrossAppMapping);
-		}
-
-		public override double [] MapRawImageCoordinates (System.String imageFieldName)
-		{
-			return w.MapRawImageCoordinates (imageFieldName);
-		}
-
-		public override void SaveAs (string filename, bool includeHeaders)
-		{
-			w.SaveAs (filename, includeHeaders);
-		}
-
-		public override void ValidateInput ()
-		{
-			w.ValidateInput ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
deleted file mode 100644
index d7c76d44292..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
+++ /dev/null
@@ -1,390 +0,0 @@
-//
-// HttpResponseBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Text;
-using System.Web.Caching;
-using System.Threading;
-
-using System.Web.Routing;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpResponseBase
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-
-		public virtual bool Buffer { get { NotImplemented (); return false; } set { NotImplemented (); } }
-
-		public virtual bool BufferOutput { get { NotImplemented (); return false; } set { NotImplemented (); } }
-
-		public virtual HttpCachePolicyBase Cache { get { NotImplemented (); return null; } }
-
-		public virtual string CacheControl { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual string Charset { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual CancellationToken ClientDisconnectedToken { get { NotImplemented (); return CancellationToken.None; } }
-
-		public virtual Encoding ContentEncoding { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual string ContentType { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual HttpCookieCollection Cookies { get { NotImplemented (); return null; } }
-
-		public virtual int Expires { get { NotImplemented (); return 0; } set { NotImplemented (); } }
-
-		public virtual DateTime ExpiresAbsolute { get { NotImplemented (); return DateTime.MinValue; } set { NotImplemented (); } }
-
-		public virtual Stream Filter { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual Encoding HeaderEncoding { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual NameValueCollection Headers { get { NotImplemented (); return null; } }
-
-		public virtual bool IsClientConnected { get { NotImplemented (); return false; } }
-
-		public virtual bool IsRequestBeingRedirected { get { NotImplemented (); return false; } }
-
-		public virtual TextWriter Output { get { NotImplemented (); return null; }  set { NotImplemented (); } }
-
-		public virtual Stream OutputStream { get { NotImplemented (); return null; } }
-
-		public virtual string RedirectLocation { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual string Status { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual int StatusCode { get { NotImplemented (); return 0; } set { NotImplemented (); } }
-
-		public virtual string StatusDescription { get { NotImplemented (); return null; } set { NotImplemented (); } }
-
-		public virtual int SubStatusCode { get { NotImplemented (); return 0; } set { NotImplemented (); } }
-
-		public virtual bool SuppressContent { get { NotImplemented (); return false; } set { NotImplemented (); } }
-
-		public virtual bool SuppressFormsAuthenticationRedirect { get { NotImplemented (); return false; } set { NotImplemented (); } }
-
-		public virtual bool TrySkipIisCustomErrors { get { NotImplemented (); return false; } set { NotImplemented (); } }
-
-
-		public virtual void AddCacheDependency (params CacheDependency [] dependencies)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AddCacheItemDependencies (ArrayList cacheKeys)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AddCacheItemDependencies (string [] cacheKeys)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AddCacheItemDependency (string cacheKey)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AddFileDependencies (ArrayList filenames)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AddFileDependencies (string [] filenames)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AddFileDependency (string filename)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AddHeader (string name, string value)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AppendCookie (HttpCookie cookie)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AppendHeader (string name, string value)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void AppendToLog (string param)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual string ApplyAppPathModifier (string virtualPath)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-
-		public virtual void BinaryWrite (byte [] buffer)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Clear ()
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void ClearContent ()
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void ClearHeaders ()
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Close ()
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void DisableKernelCache ()
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void End ()
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Flush ()
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Pics (string value)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Redirect (string url)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Redirect (string url, bool endResponse)
-		{
-			NotImplemented ();
-		}
-		public virtual void RedirectPermanent (string url)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectPermanent (string url, bool endResponse)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoute (object routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoute (RouteValueDictionary routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoute (string routeName)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoute (string routeName, object routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoute (string routeName, RouteValueDictionary routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoutePermanent (object routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoutePermanent (RouteValueDictionary routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoutePermanent (string routeName)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoutePermanent (string routeName, object routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RedirectToRoutePermanent (string routeName, RouteValueDictionary routeValues)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RemoveOutputCacheItem (string path, string providerName)
-		{
-			NotImplemented ();
-		}
-		public virtual void RemoveOutputCacheItem (string path)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void SetCookie (HttpCookie cookie)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void TransmitFile (string filename)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void TransmitFile (string filename, long offset, long length)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Write (char ch)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Write (object obj)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Write (string s)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void Write (char [] buffer, int index, int count)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void WriteFile (string filename)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void WriteFile (string filename, bool readIntoMemory)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void WriteFile (IntPtr fileHandle, long offset, long size)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void WriteFile (string filename, long offset, long size)
-		{
-			NotImplemented ();
-		}
-
-
-		public virtual void WriteSubstitution (HttpResponseSubstitutionCallback callback)
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
deleted file mode 100644
index 1e437e4621f..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-//
-// HttpResponseWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Text;
-using System.Web.Caching;
-using System.Threading;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpResponseWrapper : HttpResponseBase
-	{
-		HttpResponse w;
-
-		public HttpResponseWrapper (HttpResponse httpResponse)
-		{
-			if (httpResponse == null)
-				throw new ArgumentNullException ("httpResponse");
-			w = httpResponse;
-		}
-
-		public override bool Buffer {
-			get { return w.Buffer; }
-			set { w.Buffer = value; }
-		}
-
-		public override bool BufferOutput {
-			get { return w.BufferOutput; }
-			set { w.BufferOutput = value; }
-		}
-
-		public override HttpCachePolicyBase Cache {
-			get { return new HttpCachePolicyWrapper (w.Cache); }
-		}
-
-		public override string CacheControl {
-			get { return w.CacheControl; }
-			set { w.CacheControl = value; }
-		}
-
-		public override string Charset {
-			get { return w.Charset; }
-			set { w.Charset = value; }
-		}
-
-		public override CancellationToken ClientDisconnectedToken {
-			get { return CancellationToken.None; }
-		}
-
-		public override Encoding ContentEncoding {
-			get { return w.ContentEncoding; }
-			set { w.ContentEncoding = value; }
-		}
-
-		public override string ContentType {
-			get { return w.ContentType; }
-			set { w.ContentType = value; }
-		}
-
-		public override HttpCookieCollection Cookies {
-			get { return w.Cookies; }
-		}
-
-		public override int Expires {
-			get { return w.Expires; }
-			set { w.Expires = value; }
-		}
-
-		public override DateTime ExpiresAbsolute {
-			get { return w.ExpiresAbsolute; }
-			set { w.ExpiresAbsolute = value; }
-		}
-
-		public override Stream Filter {
-			get { return w.Filter; }
-			set { w.Filter = value; }
-		}
-
-		public override Encoding HeaderEncoding {
-			get { return w.HeaderEncoding; }
-			set { w.HeaderEncoding = value; }
-		}
-
-		public override NameValueCollection Headers {
-			get { return w.Headers; }
-		}
-
-		public override bool IsClientConnected {
-			get { return w.IsClientConnected; }
-		}
-
-		public override bool IsRequestBeingRedirected {
-			get { return w.IsRequestBeingRedirected; }
-		}
-
-		public override TextWriter Output {
-			get { return w.Output; }
-			set { w.Output = value; }
-		}
-
-		public override Stream OutputStream {
-			get { return w.OutputStream; }
-		}
-
-		public override string RedirectLocation {
-			get { return w.RedirectLocation; }
-			set { w.RedirectLocation = value; }
-		}
-
-		public override string Status {
-			get { return w.Status; }
-			set { w.Status = value; }
-		}
-
-		public override int StatusCode {
-			get { return w.StatusCode; }
-			set { w.StatusCode = value; }
-		}
-
-		public override string StatusDescription {
-			get { return w.StatusDescription; }
-			set { w.StatusDescription = value; }
-		}
-
-		public override int SubStatusCode {
-			get { return w.SubStatusCode; }
-			set { w.SubStatusCode = value; }
-		}
-
-		public override bool SuppressContent {
-			get { return w.SuppressContent; }
-			set { w.SuppressContent = value; }
-		}
-
-		public override bool SuppressFormsAuthenticationRedirect {
-			get { return w.SuppressFormsAuthenticationRedirect; }
-			set { w.SuppressFormsAuthenticationRedirect = value; }
-		}
-
-		public override bool TrySkipIisCustomErrors {
-			get { return w.TrySkipIisCustomErrors; }
-			set { w.TrySkipIisCustomErrors = value; }
-		}
-
-		public override void AddCacheDependency (params CacheDependency [] dependencies)
-		{
-			w.AddCacheDependency (dependencies);
-		}
-
-		public override void AddCacheItemDependencies (ArrayList cacheKeys)
-		{
-			w.AddCacheItemDependencies (cacheKeys);
-		}
-
-		public override void AddCacheItemDependencies (string [] cacheKeys)
-		{
-			w.AddCacheItemDependencies (cacheKeys);
-		}
-
-		public override void AddCacheItemDependency (string cacheKey)
-		{
-			w.AddCacheItemDependency (cacheKey);
-		}
-
-		public override void AddFileDependencies (ArrayList filenames)
-		{
-			w.AddFileDependencies (filenames);
-		}
-
-		public override void AddFileDependencies (string [] filenames)
-		{
-			w.AddFileDependencies (filenames);
-		}
-
-		public override void AddFileDependency (string filename)
-		{
-			w.AddFileDependency (filename);
-		}
-
-		public override void AddHeader (string name, string value)
-		{
-			w.AddHeader (name, value);
-		}
-
-		public override void AppendCookie (HttpCookie cookie)
-		{
-			w.AppendCookie (cookie);
-		}
-
-		public override void AppendHeader (string name, string value)
-		{
-			w.AppendHeader (name, value);
-		}
-
-		public override void AppendToLog (string param)
-		{
-			w.AppendToLog (param);
-		}
-
-		public override string ApplyAppPathModifier (string overridePath)
-		{
-			return w.ApplyAppPathModifier (overridePath);
-		}
-
-		public override void BinaryWrite (byte [] buffer)
-		{
-			w.BinaryWrite (buffer);
-		}
-
-		public override void Clear ()
-		{
-			w.Clear ();
-		}
-
-		public override void ClearContent ()
-		{
-			w.ClearContent ();
-		}
-
-		public override void ClearHeaders ()
-		{
-			w.ClearHeaders ();
-		}
-
-		public override void Close ()
-		{
-			w.Close ();
-		}
-
-		public override void DisableKernelCache ()
-		{
-			 w.DisableKernelCache ();
-		}
-
-		public override void End ()
-		{
-			w.End ();
-		}
-
-		public override void Flush ()
-		{
-			w.Flush ();
-		}
-
-		public override void Pics (string value)
-		{
-			w.Pics (value);
-		}
-
-		public override void Redirect (string url)
-		{
-			w.Redirect (url);
-		}
-
-		public override void Redirect (string url, bool endResponse)
-		{
-			w.Redirect (url, endResponse);
-		}
-		public override void RedirectPermanent (string url)
-		{
-			w.RedirectPermanent (url);
-		}
-
-		public override void RedirectPermanent (string url, bool endResponse)
-		{
-			w.RedirectPermanent (url, endResponse);
-		}
-
-		public override void RemoveOutputCacheItem (string path, string providerName)
-		{
-			HttpResponse.RemoveOutputCacheItem (path, providerName);
-		}
-		public override void RemoveOutputCacheItem (string path)
-		{
-			 HttpResponse.RemoveOutputCacheItem (path);
-		}
-
-		public override void SetCookie (HttpCookie cookie)
-		{
-			w.SetCookie (cookie);
-		}
-
-		public override void TransmitFile (string filename)
-		{
-			w.TransmitFile (filename);
-		}
-
-		public override void TransmitFile (string filename, long offset, long length)
-		{
-			w.TransmitFile (filename, offset, length);
-		}
-
-		public override void Write (char ch)
-		{
-			w.Write (ch);
-		}
-
-		public override void Write (object obj)
-		{
-			w.Write (obj);
-		}
-
-		public override void Write (string s)
-		{
-			w.Write (s);
-		}
-
-		public override void Write (char [] buffer, int index, int count)
-		{
-			w.Write (buffer, index, count);
-		}
-
-		public override void WriteFile (string filename)
-		{
-			w.WriteFile (filename);
-		}
-
-		public override void WriteFile (string filename, bool readIntoMemory)
-		{
-			w.WriteFile (filename, readIntoMemory);
-		}
-
-		public override void WriteFile (IntPtr fileHandle, long offset, long size)
-		{
-			w.WriteFile (fileHandle, offset, size);
-		}
-
-		public override void WriteFile (string filename, long offset, long size)
-		{
-			w.WriteFile (filename, offset, size);
-		}
-
-		public override void WriteSubstitution (HttpResponseSubstitutionCallback callback)
-		{
-			w.WriteSubstitution (callback);
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs
deleted file mode 100644
index a56c2c148aa..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// HttpServerUtilityBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.Profile;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpServerUtilityBase
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual string MachineName { get { NotImplemented (); return null; } }
-
-		public virtual int ScriptTimeout { get { NotImplemented (); return 0; } set { NotImplemented (); } }
-
-
-		public virtual void ClearError ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual object CreateObject (string progID)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object CreateObject (Type type)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object CreateObjectFromClsid (string clsid)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void Execute (string path)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Execute (string path, bool preserveForm)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Execute (string path, TextWriter writer)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Execute (string path, TextWriter writer, bool preserveForm)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Execute (IHttpHandler handler, TextWriter writer, bool preserveForm)
-		{
-			NotImplemented ();
-		}
-
-		public virtual Exception GetLastError ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual string HtmlDecode (string s)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void HtmlDecode (string s, TextWriter output)
-		{
-			NotImplemented ();
-		}
-
-		public virtual string HtmlEncode (string s)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void HtmlEncode (string s, TextWriter output)
-		{
-			NotImplemented ();
-		}
-
-		public virtual string MapPath (string path)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void Transfer (string path)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Transfer (string path, bool preserveForm)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Transfer (IHttpHandler handler, bool preserveForm)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void TransferRequest (string path)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void TransferRequest (string path, bool preserveForm)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void TransferRequest (string path, bool preserveForm, string method, NameValueCollection headers)
-		{
-			NotImplemented ();
-		}
-
-		public virtual string UrlDecode (string s)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void UrlDecode (string s, TextWriter output)
-		{
-			NotImplemented ();
-		}
-
-		public virtual string UrlEncode (string s)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void UrlEncode (string s, TextWriter output)
-		{
-			NotImplemented ();
-		}
-
-		public virtual string UrlPathEncode (string s)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual byte [] UrlTokenDecode (string input)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual string UrlTokenEncode (byte [] input)
-		{
-			NotImplemented ();
-			return null;
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs
deleted file mode 100644
index 52fc7a1981d..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// HttpServerUtilityWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.Profile;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpServerUtilityWrapper : HttpServerUtilityBase
-	{
-		HttpServerUtility w;
-
-		public HttpServerUtilityWrapper (HttpServerUtility httpServerUtility)
-		{
-			if (httpServerUtility == null)
-				throw new ArgumentNullException ("httpServerUtility");
-			w = httpServerUtility;
-		}
-
-		public override string MachineName {
-			get { return w.MachineName; }
-		}
-
-		public override int ScriptTimeout {
-			get { return w.ScriptTimeout; }
-			set { w.ScriptTimeout = value; }
-		}
-
-		public override void ClearError ()
-		{
-			w.ClearError ();
-		}
-
-		public override object CreateObject (string progID)
-		{
-			return w.CreateObject (progID);
-		}
-
-		public override object CreateObject (Type type)
-		{
-			return w.CreateObject (type);
-		}
-
-		public override object CreateObjectFromClsid (string clsid)
-		{
-			return w.CreateObjectFromClsid (clsid);
-		}
-
-		public override void Execute (string path)
-		{
-			w.Execute (path);
-		}
-
-		public override void Execute (string path, bool preserveForm)
-		{
-			w.Execute (path, preserveForm);
-		}
-
-		public override void Execute (string path, TextWriter writer)
-		{
-			w.Execute (path, writer);
-		}
-
-		public override void Execute (string path, TextWriter writer, bool preserveForm)
-		{
-			w.Execute (path, writer, preserveForm);
-		}
-
-		public override void Execute (IHttpHandler handler, TextWriter writer, bool preserveForm)
-		{
-			w.Execute (handler, writer, preserveForm);
-		}
-
-		public override Exception GetLastError ()
-		{
-			return w.GetLastError ();
-		}
-
-		public override string HtmlDecode (string s)
-		{
-			return w.HtmlDecode (s);
-		}
-
-		public override void HtmlDecode (string s, TextWriter output)
-		{
-			w.HtmlDecode (s, output);
-		}
-
-		public override string HtmlEncode (string s)
-		{
-			return w.HtmlEncode (s);
-		}
-
-		public override void HtmlEncode (string s, TextWriter output)
-		{
-			w.HtmlEncode (s, output);
-		}
-
-		public override string MapPath (string path)
-		{
-			return w.MapPath (path);
-		}
-
-		public override void Transfer (string path)
-		{
-			w.Transfer (path);
-		}
-
-		public override void Transfer (string path, bool preserveForm)
-		{
-			w.Transfer (path, preserveForm);
-		}
-
-		public override void Transfer (IHttpHandler handler, bool preserveForm)
-		{
-			w.Transfer (handler, preserveForm);
-		}
-
-		[MonoTODO]
-		public override void TransferRequest (string path)
-		{
-			// return TransferRequest (path);
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override void TransferRequest (string path, bool preserveForm)
-		{
-			// return TransferRequest (path, preserveForm);
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override void TransferRequest (string path, bool preserveForm, string method, NameValueCollection headers)
-		{
-			// return TransferRequest (path, preserveForm, method, headers);
-			throw new NotImplementedException ();
-		}
-
-		public override string UrlDecode (string s)
-		{
-			return w.UrlDecode (s);
-		}
-
-		public override void UrlDecode (string s, TextWriter output)
-		{
-			w.UrlDecode (s, output);
-		}
-
-		public override string UrlEncode (string s)
-		{
-			return w.UrlEncode (s);
-		}
-
-		public override void UrlEncode (string s, TextWriter output)
-		{
-			w.UrlEncode (s, output);
-		}
-
-		public override string UrlPathEncode (string s)
-		{
-			return w.UrlPathEncode (s);
-		}
-
-		[MonoTODO]
-		public override byte [] UrlTokenDecode (string input)
-		{
-			// return w.UrlTokenDecode (input);
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override string UrlTokenEncode (byte [] input)
-		{
-			// return w.UrlTokenEncode (input);
-			throw new NotImplementedException ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs
deleted file mode 100644
index 61edd04b93a..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// HttpSessionStateBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.SessionState;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpSessionStateBase : ICollection, IEnumerable
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual int CodePage { get { NotImplemented (); return 0; } set { NotImplemented (); } }
-
-		public virtual HttpSessionStateBase Contents { get { NotImplemented (); return null; } }
-
-		public virtual HttpCookieMode CookieMode { get { NotImplemented (); return default (HttpCookieMode); } }
-
-		public virtual int Count { get { NotImplemented (); return 0; } }
-
-		public virtual bool IsCookieless { get { NotImplemented (); return false; } }
-
-		public virtual bool IsNewSession { get { NotImplemented (); return false; } }
-
-		public virtual bool IsReadOnly { get { NotImplemented (); return false; } }
-
-		public virtual bool IsSynchronized { get { NotImplemented (); return false; } }
-
-		public virtual object this [int index] {
-			get { NotImplemented (); return null; }
-			set { NotImplemented (); }
-		}
-
-		public virtual object this [string name] {
-			get { NotImplemented (); return null; }
-			set { NotImplemented (); }
-		}
-
-		public virtual NameObjectCollectionBase.KeysCollection Keys { get { NotImplemented (); return null; } }
-
-		public virtual int LCID { get { NotImplemented (); return 0; } set { NotImplemented (); } }
-
-		public virtual SessionStateMode Mode { get { NotImplemented (); return default (SessionStateMode); } }
-
-		public virtual string SessionID { get { NotImplemented (); return null; } }
-
-		public virtual HttpStaticObjectsCollectionBase StaticObjects { get { NotImplemented (); return null; } }
-
-		public virtual object SyncRoot { get { NotImplemented (); return null; } }
-
-		public virtual int Timeout { get { NotImplemented (); return 0; } set { NotImplemented (); } }
-
-
-		public virtual void Abandon ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Add (string name, object value)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void Clear ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void CopyTo (Array array, int index)
-		{
-			NotImplemented ();
-		}
-
-		public virtual IEnumerator GetEnumerator ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void Remove (string name)
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RemoveAll ()
-		{
-			NotImplemented ();
-		}
-
-		public virtual void RemoveAt (int index)
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs
deleted file mode 100644
index 563eb0ba09e..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// HttpSessionStateWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.SessionState;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpSessionStateWrapper : HttpSessionStateBase
-	{
-		HttpSessionState w;
-
-		public HttpSessionStateWrapper (HttpSessionState httpSessionState)
-		{
-			if (httpSessionState == null)
-				throw new ArgumentNullException ("httpSessionState");
-			w = httpSessionState;
-		}
-
-		public override int CodePage {
-			get { return w.CodePage; }
-			set { w.CodePage = value; }
-		}
-
-		public override HttpSessionStateBase Contents {
-			get { throw new NotImplementedException (); }
-		}
-
-		[MonoTODO]
-		public override HttpCookieMode CookieMode {
-			//get { return w.CookieMode; }
-			get { throw new NotImplementedException (); }
-		}
-
-		public override int Count {
-			get { return w.Count; }
-		}
-
-		public override bool IsCookieless {
-			get { return w.IsCookieless; }
-		}
-
-		public override bool IsNewSession {
-			get { return w.IsNewSession; }
-		}
-
-		public override bool IsReadOnly {
-			get { return w.IsReadOnly; }
-		}
-
-		public override bool IsSynchronized {
-			get { return w.IsSynchronized; }
-		}
-
-		public override object this [int index] {
-			get { return w [index]; }
-			set { w [index] = value; }
-		}
-
-		public override object this [string name] {
-			get { return w [name]; }
-			set { w [name] = value; }
-		}
-
-		public override NameObjectCollectionBase.KeysCollection Keys {
-			get { return w.Keys; }
-		}
-
-		public override int LCID {
-			get { return w.LCID; }
-			set { w.LCID = value; }
-		}
-
-		public override SessionStateMode Mode {
-			get { return w.Mode; }
-		}
-
-		public override string SessionID {
-			get { return w.SessionID; }
-		}
-
-		public override HttpStaticObjectsCollectionBase StaticObjects {
-			get { throw new NotImplementedException (); }
-		}
-
-		public override object SyncRoot {
-			get { return w.SyncRoot; }
-		}
-
-		public override int Timeout {
-			get { return w.Timeout; }
-			set { w.Timeout = value; }
-		}
-
-		public override void Abandon ()
-		{
-			w.Abandon ();
-		}
-
-		public override void Add (string name, object value)
-		{
-			w.Add (name, value);
-		}
-
-		public override void Clear ()
-		{
-			w.Clear ();
-		}
-
-		public override void CopyTo (Array array, int index)
-		{
-			w.CopyTo (array, index);
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			return w.GetEnumerator ();
-		}
-
-		public override void Remove (string name)
-		{
-			w.Remove (name);
-		}
-
-		public override void RemoveAll ()
-		{
-			w.RemoveAll ();
-		}
-
-		public override void RemoveAt (int index)
-		{
-			w.RemoveAt (index);
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs
deleted file mode 100644
index ee9b9c2a461..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// HttpStaticObjectsCollectionBase.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.SessionState;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public abstract class HttpStaticObjectsCollectionBase : ICollection, IEnumerable
-	{
-		void NotImplemented ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public virtual int Count { get { NotImplemented (); return 0; } }
-
-		public virtual bool IsReadOnly { get { NotImplemented (); return false; } }
-
-		public virtual bool IsSynchronized { get { NotImplemented (); return false; } }
-
-		public virtual object this [string name] {
-			get { NotImplemented (); return null; }
-		}
-
-		public virtual bool NeverAccessed { get { NotImplemented (); return false; } }
-
-		public virtual object SyncRoot { get { NotImplemented (); return null; } }
-
-		public virtual void CopyTo (Array array, int index)
-		{
-			NotImplemented ();
-		}
-
-		public virtual IEnumerator GetEnumerator ()
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual object GetObject (string name)
-		{
-			NotImplemented ();
-			return null;
-		}
-
-		public virtual void Serialize (BinaryWriter writer)
-		{
-			NotImplemented ();
-		}
-	}
-}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs
deleted file mode 100644
index 4f33434663c..00000000000
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// HttpStaticObjectsCollectionWrapper.cs
-//
-// Author:
-//	Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.SessionState;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-	public class HttpStaticObjectsCollectionWrapper : HttpStaticObjectsCollectionBase
-	{
-		HttpStaticObjectsCollection w;
-
-		public HttpStaticObjectsCollectionWrapper (HttpStaticObjectsCollection httpStaticObjectsCollection)
-		{
-			if (httpStaticObjectsCollection == null)
-				throw new ArgumentNullException ("httpStaticObjectsCollection");
-			w = httpStaticObjectsCollection;
-		}
-
-		public override int Count {
-			get { return w.Count; }
-		}
-
-		public override bool IsReadOnly {
-			get { return w.IsReadOnly; }
-		}
-
-		public override bool IsSynchronized {
-			get { return w.IsSynchronized; }
-		}
-
-		public override object this [string name] {
-			get { return w [name]; }
-		}
-
-		public override bool NeverAccessed {
-			get { return w.NeverAccessed; }
-		}
-
-		public override object SyncRoot {
-			get { return w.SyncRoot; }
-		}
-
-		public override void CopyTo (Array array, int index)
-		{
-			w.CopyTo (array, index);
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			return w.GetEnumerator ();
-		}
-
-		public override object GetObject (string name)
-		{
-			return w.GetObject (name);
-		}
-
-		public override void Serialize (BinaryWriter writer)
-		{
-			w.Serialize (writer);
-		}
-	}
-}