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

	* SessionStateServerHandler.cs: CONFIGURATION_2_0 => NET_2_0.

	* SessionSQLServerHandler.cs: same.

	* SessionStateModule.cs: same.

	* ISessionHandler.cs: same.

	* SessionInProcHandler.cs: same.

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

diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
index bce20913ac0b43bd8f35f03e4e56ca543ac6d13f..0e93b44455272e57da919526fd5eab555320e56f 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/ChangeLog
+++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
@@ -1,3 +1,15 @@
+2006-02-01  Chris Toshok  <toshok@ximian.com>
+
+       * SessionStateServerHandler.cs: CONFIGURATION_2_0 => NET_2_0.
+
+       * SessionSQLServerHandler.cs: same.
+
+       * SessionStateModule.cs: same.
+
+       * ISessionHandler.cs: same.
+
+       * SessionInProcHandler.cs: same.
+
 2006-01-18 Konstantin Triger <kostat@mainsoft.com>
 
        * HttpSessionState.jvm.cs: correcting serialization conditions.

diff --git a/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs b/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs
index af7db73693ce8b8fa484158d329d345e6fab3405..26080c93bd1efb0e3d731f264af9cfd1d5e52367 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/ISessionHandler.cs
@@ -38,7 +38,7 @@ namespace System.Web.SessionState
        {
                void Dispose ();
                void Init (SessionStateModule module, HttpApplication context,
-#if CONFIGURATION_2_0
+#if NET_2_0
                           SessionStateSection config
 #else
                           SessionConfig config

diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs b/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs
index f815095fe5c617a58c7c1a702c4270d2b78eceac..3ffcf16837cba729970ed9a842190aeb3b20e2eb 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionInProcHandler.cs
@@ -40,7 +40,7 @@ namespace System.Web.SessionState
 {
        class SessionInProcHandler : ISessionHandler
        {
-#if CONFIGURATION_2_0
+#if NET_2_0
                SessionStateSection config;
 #else
                SessionConfig config;
@@ -50,7 +50,7 @@ namespace System.Web.SessionState
                public void Dispose () { }
 
                public void Init (SessionStateModule module, HttpApplication context,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                  SessionStateSection config
 #else
                                  SessionConfig config
@@ -91,7 +91,7 @@ namespace System.Web.SessionState
                        state = new HttpSessionState (sessionID, // unique identifier
                                                new SessionDictionary(), // dictionary
                                                HttpApplicationFactory.ApplicationState.SessionObjects,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                                (int)config.Timeout.TotalMinutes, // XXX is this right?  we lose some precision here, but since the timeout is in minutes *anyway*...
 #else
                                                config.Timeout, //lifetime before death.
@@ -101,7 +101,7 @@ namespace System.Web.SessionState
                                                SessionStateMode.InProc,
                                                read_only); //readonly
 
-#if CONFIGURATION_2_0
+#if NET_2_0
                        TimeSpan timeout = TimeSpan.FromMinutes ((int)config.Timeout.TotalMinutes);
 #else
                        TimeSpan timeout = new TimeSpan (0, config.Timeout, 0);

diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs b/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
index 8a856f6c3342921e6491f90969f7d9702c94596e..c820bb90de81b797704ad361e6d48ffbb01f971c 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionSQLServerHandler.cs
@@ -42,7 +42,7 @@ namespace System.Web.SessionState {
        {
                private static Type cncType = null;
                private IDbConnection cnc = null;
-#if CONFIGURATION_2_0
+#if NET_2_0
                private SessionStateSection config;
 #else
                private SessionConfig config;
@@ -57,7 +57,7 @@ namespace System.Web.SessionState {
                }
 
                public void Init (SessionStateModule module, HttpApplication context,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                  SessionStateSection config
 #else
                                  SessionConfig config
@@ -123,7 +123,7 @@ namespace System.Web.SessionState {
                        id = SessionId.Create (module.Rng);
                        session = new HttpSessionState (id, new SessionDictionary (),
                                        HttpApplicationFactory.ApplicationState.SessionObjects,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                        (int)config.Timeout.TotalMinutes,
 #else
                                        config.Timeout,
@@ -131,7 +131,7 @@ namespace System.Web.SessionState {
                                        true, config.CookieLess, SessionStateMode.SQLServer, read_only);
 
                        InsertSession (session,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                       (int)config.Timeout.TotalMinutes
 #else
                                       config.Timeout

diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
index 7e6b1ca9e9b1329fc290817bff1c7a3b7de3de1d..dc6d33b3e5cd7c71527736dd61fb90fd8a57e825 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
@@ -64,7 +64,7 @@ namespace System.Web.SessionState
                        }
                }
 #else
-#if CONFIGURATION_2_0
+#if NET_2_0
                static SessionStateSection config;
 #else
                static SessionConfig config;
@@ -91,7 +91,7 @@ namespace System.Web.SessionState
                        handler.Dispose();
                }
 
-#if CONFIGURATION_2_0
+#if NET_2_0
                SessionStateSection GetConfig ()
 #else
                SessionConfig GetConfig ()
@@ -101,7 +101,7 @@ namespace System.Web.SessionState
                                if (config != null)
                                        return config;
 
-#if CONFIGURATION_2_0
+#if NET_2_0
                                config = (SessionStateSection) WebConfigurationManager.GetSection ("system.web/sessionState");
 #else
                                config = (SessionConfig) HttpContext.GetAppConfig ("system.web/sessionState");
@@ -130,7 +130,7 @@ namespace System.Web.SessionState
                public void Init (HttpApplication app)
                {
                        sessionForStaticFiles = (Environment.GetEnvironmentVariable ("MONO_XSP_STATIC_SESSION") != null);
-#if CONFIGURATION_2_0
+#if NET_2_0
                        SessionStateSection cfg = GetConfig ();
 #else
                        SessionConfig cfg = GetConfig ();
@@ -239,7 +239,7 @@ namespace System.Web.SessionState
 
                internal void OnSessionRemoved (string key, object value, CacheItemRemovedReason reason)
                {
-#if CONFIGURATION_2_0
+#if NET_2_0
                        SessionStateSection cfg = GetConfig ();
 #else
                        SessionConfig cfg = GetConfig ();

diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs
index 2dd27283a4b5d7bb4f1556050c32ece1c1797fa0..701d4c1b728682bb61d6e2e26b5c14c6cc1e2741 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateServerHandler.cs
@@ -43,7 +43,7 @@ namespace System.Web.SessionState {
                const string CookieName = "ASPSESSION";
 
                private RemoteStateServer state_server;
-#if CONFIGURATION_2_0
+#if NET_2_0
                private SessionStateSection config;
 #else
                private SessionConfig config;
@@ -54,7 +54,7 @@ namespace System.Web.SessionState {
                }
 
                public void Init (SessionStateModule module, HttpApplication context,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                  SessionStateSection config
 #else
                                  SessionConfig config
@@ -104,7 +104,7 @@ namespace System.Web.SessionState {
                                        sobjs = HttpStaticObjectsCollection.FromByteArray (item.StaticObjectsData);
                                        session = new HttpSessionState (id, dict,
                                                        HttpApplicationFactory.ApplicationState.SessionObjects,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                                        (int)config.Timeout.TotalMinutes, // XXX is this right?  we lose some precision here, but since the timeout is in minutes *anyway*...
 #else
                                                        config.Timeout,
@@ -120,7 +120,7 @@ namespace System.Web.SessionState {
                        dict = new SessionDictionary ();
                        sobjs = HttpApplicationFactory.ApplicationState.SessionObjects;
                        item = new StateServerItem (dict.ToByteArray (), sobjs.ToByteArray (),
-#if CONFIGURATION_2_0
+#if NET_2_0
                                                    (int)config.Timeout.TotalMinutes
 #else
                                                    config.Timeout
@@ -130,7 +130,7 @@ namespace System.Web.SessionState {
                        state_server.Insert (id, item);
 
                        session = new HttpSessionState (id, dict, sobjs,
-#if CONFIGURATION_2_0
+#if NET_2_0
                                                        (int)config.Timeout.TotalMinutes,
 #else
                                                        config.Timeout,