In System.Web:

2006-02-28  Chris Toshok  <toshok@ximian.com>

	* HttpCookieMode.cs: corcompare work.

	* ProcessShutdownReason.cs: same.

	* SiteMapNodeCollection.cs: same.

	* SiteMapNode.cs: same.

	* SiteMapProvider.cs: same.

	* HttpCacheRevalidation.cs: same.

	* HttpCacheability.cs: same.

	* StaticSiteMapProvider.cs: same.

	* HttpValidationStatus.cs: same.
	
In System.Web.SessionState:
	* SessionStateActions.cs: oops, actually rename the enum, not just
	the file.

2006-02-28  Chris Toshok  <toshok@ximian.com>


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

12 files changed, 46 insertions, 11 deletions

diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
index 05c42bdbff2..6c6833ac848 100644
--- a/mcs/class/System.Web/System.Web.SessionState/ChangeLog
+++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-28  Chris Toshok  <toshok@ximian.com>
 
+	* SessionStateActions.cs: oops, actually rename the enum, not just
+	the file.
+
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
 	* SessionStateActions.cs: rename SessionStateActionFlags to this.
 
 	* ISessionIDManager.cs: rename ISessionIDModule to this.
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs
index 52a10def8ee..f3bfc7ec039 100644
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateActions.cs
@@ -1,5 +1,5 @@
 //
-// System.Web.SessionState.SessionStateActionFlags.cs
+// System.Web.SessionState.SessionStateActions.cs
 //
 // Authors:
 //	Sanjay Gupta (gsanjay@novell.com)
@@ -28,7 +28,7 @@
 
 #if NET_2_0
 namespace System.Web.SessionState {
-	public enum SessionStateActionFlags {
+	public enum SessionStateActions {
 		InitializeItem	= 1
 	}
 }
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index 23974f448bd..f5d79e55ac4 100644
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,23 @@
+2006-02-28  Chris Toshok  <toshok@ximian.com>
+
+	* HttpCookieMode.cs: corcompare work.
+
+	* ProcessShutdownReason.cs: same.
+
+	* SiteMapNodeCollection.cs: same.
+
+	* SiteMapNode.cs: same.
+
+	* SiteMapProvider.cs: same.
+
+	* HttpCacheRevalidation.cs: same.
+
+	* HttpCacheability.cs: same.
+
+	* StaticSiteMapProvider.cs: same.
+
+	* HttpValidationStatus.cs: same.
+	
 2006-02-06 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* DefaultHttpHandler.cs: New file.
diff --git a/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs b/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
index afb4f5181eb..81fdf21ff2c 100644
--- a/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
+++ b/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
@@ -29,7 +29,9 @@
 //
 
 namespace System.Web {
+#if !NET_2_0
 	[Serializable]
+#endif
 	public enum HttpCacheRevalidation {
 		AllCaches = 0x1,
 		ProxyCaches,
diff --git a/mcs/class/System.Web/System.Web/HttpCacheability.cs b/mcs/class/System.Web/System.Web/HttpCacheability.cs
index f8f4fcb2923..abf0a0c2af4 100644
--- a/mcs/class/System.Web/System.Web/HttpCacheability.cs
+++ b/mcs/class/System.Web/System.Web/HttpCacheability.cs
@@ -29,7 +29,9 @@
 //
 
 namespace System.Web {
+#if !NET_2_0
 	[Serializable]
+#endif
 	public enum HttpCacheability {
 		NoCache = 0x1,
 		Private,
diff --git a/mcs/class/System.Web/System.Web/HttpCookieMode.cs b/mcs/class/System.Web/System.Web/HttpCookieMode.cs
index bc48d6bb95a..9bcadf217d2 100644
--- a/mcs/class/System.Web/System.Web/HttpCookieMode.cs
+++ b/mcs/class/System.Web/System.Web/HttpCookieMode.cs
@@ -29,7 +29,9 @@
 #if NET_2_0
 namespace System.Web
 {
+#if !NET_2_0
         [Serializable]
+#endif
         public enum HttpCookieMode
         {
                 UseUri = 0,
diff --git a/mcs/class/System.Web/System.Web/HttpValidationStatus.cs b/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
index b8e873452f6..d30201becaf 100644
--- a/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
+++ b/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
@@ -29,7 +29,9 @@
 //
 
 namespace System.Web {
+#if !NET_2_0
 	[Serializable]
+#endif
         public enum HttpValidationStatus {
                 Invalid = 0x1,
                 IgnoreThisRequest,
diff --git a/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs b/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
index b8cba9d6809..f98a9d9793a 100644
--- a/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
+++ b/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
@@ -29,7 +29,9 @@
 //
 
 namespace System.Web {
+#if !NET_2_0
 	[Serializable]
+#endif
 	public enum ProcessShutdownReason {
 		None,
 		Unexpected,
diff --git a/mcs/class/System.Web/System.Web/SiteMapNode.cs b/mcs/class/System.Web/System.Web/SiteMapNode.cs
index 1ffac4dcf38..388a7e3a70f 100644
--- a/mcs/class/System.Web/System.Web/SiteMapNode.cs
+++ b/mcs/class/System.Web/System.Web/SiteMapNode.cs
@@ -73,7 +73,7 @@ namespace System.Web {
 			return new SiteMapHierarchicalDataSourceView (this);
 		}
 		
-		public bool IsAccessibleToUser (System.Web.HttpContext ctx)
+		public virtual bool IsAccessibleToUser (System.Web.HttpContext ctx)
 		{
 			return provider.IsAccessibleToUser (ctx, this);
 		}
@@ -200,7 +200,7 @@ namespace System.Web {
 		}
 		
 		[MonoTODO ("resource string?")]
-		public string this [string key]
+		public virtual string this [string key]
 		{
 			get {
 				string val = null;
@@ -284,7 +284,7 @@ namespace System.Web {
 				
 		#region Field Accessors
 		
-		public virtual NameValueCollection Attributes {
+		protected NameValueCollection Attributes {
 			get { return attributes; } 
 			set { CheckWritable (); attributes = value; }
 		}
@@ -306,7 +306,7 @@ namespace System.Web {
 			set { CheckWritable (); url = value; }
 		}
 		
-		public virtual IList Roles {
+		public IList Roles {
 			get { return roles; }
 			set { CheckWritable (); roles = value; }
 		}
diff --git a/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs b/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs
index 2c5bd5e1478..13b1536666b 100644
--- a/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs
+++ b/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs
@@ -137,17 +137,17 @@ namespace System.Web
 			List.AddRange (value);
 		}
 
-		public bool Contains (SiteMapNode value)
+		public virtual bool Contains (SiteMapNode value)
 		{
 			return this.List.Contains (value);
 		}
 		
-		public void CopyTo (System.Web.SiteMapNode[] array, int index)
+		public virtual void CopyTo (System.Web.SiteMapNode[] array, int index)
 		{
 			this.List.CopyTo (array, index);
 		}
 		
-		public int IndexOf (SiteMapNode value)
+		public virtual int IndexOf (SiteMapNode value)
 		{
 			return this.List.IndexOf (value);
 		}
diff --git a/mcs/class/System.Web/System.Web/SiteMapProvider.cs b/mcs/class/System.Web/System.Web/SiteMapProvider.cs
index 731c2773fed..b427c399192 100644
--- a/mcs/class/System.Web/System.Web/SiteMapProvider.cs
+++ b/mcs/class/System.Web/System.Web/SiteMapProvider.cs
@@ -150,7 +150,7 @@ namespace System.Web {
 			if (node == null) throw new ArgumentNullException ("node");
 		}
 		
-		public virtual void RemoveNode (SiteMapNode node)
+		protected virtual void RemoveNode (SiteMapNode node)
 		{
 			if (node == null)
 				throw new ArgumentNullException("node");
diff --git a/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs b/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs
index 3f12df44b0f..474ece1c7bc 100644
--- a/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs
+++ b/mcs/class/System.Web/System.Web/StaticSiteMapProvider.cs
@@ -195,7 +195,7 @@ namespace System.Web
 			return parent != null && IsAccessibleToUser (HttpContext.Current, parent) ? parent : null;
 		}
 		
-		public override void RemoveNode (SiteMapNode node)
+		protected override void RemoveNode (SiteMapNode node)
 		{
 			if (node == null)
 				throw new ArgumentNullException("node");