Author: kostat
Date: 2006-09-10 12:09:19 -0400 (Sun, 10 Sep 2006)
New Revision: 65176
Modified:
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Membership.cs
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Roles.cs
Log:
TARGET_J2EE: workaround static fields
Modified:
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Membership.cs
===================================================================
---
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Membership.cs
2006-09-10 15:41:47 UTC (rev 65175)
+++
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Membership.cs
2006-09-10 16:09:19 UTC (rev 65176)
@@ -42,6 +42,40 @@
{
public static class Membership
{
+#if TARGET_J2EE
+ const string Membership_providers = "Membership.providers";
+ static MembershipProviderCollection providers {
+ get {
+ object o = AppDomain.CurrentDomain.GetData
(Membership_providers);
+ if (o == null) {
+ lock (AppDomain.CurrentDomain) {
+ o =
AppDomain.CurrentDomain.GetData (Membership_providers);
+ if (o == null) {
+ MembershipSection
section = (MembershipSection) WebConfigurationManager.GetSection
("system.web/membership");
+
MembershipProviderCollection local_providers = new MembershipProviderCollection
();
+
ProvidersHelper.InstantiateProviders (section.Providers, local_providers,
typeof (MembershipProvider));
+
AppDomain.CurrentDomain.SetData (Membership_providers, local_providers);
+ o = local_providers;
+ }
+ }
+ }
+
+ return (MembershipProviderCollection) o;
+ }
+ }
+ static MembershipProvider provider {
+ get {
+ MembershipSection section = (MembershipSection)
WebConfigurationManager.GetSection ("system.web/membership");
+ return providers [section.DefaultProvider];
+ }
+ }
+ static int onlineTimeWindow {
+ get {
+ MembershipSection section = (MembershipSection)
WebConfigurationManager.GetSection ("system.web/membership");
+ return (int)
section.UserIsOnlineTimeWindow.TotalMinutes;
+ }
+ }
+#else
static MembershipProviderCollection providers;
static MembershipProvider provider;
static int onlineTimeWindow;
@@ -58,7 +92,8 @@
onlineTimeWindow = (int)
section.UserIsOnlineTimeWindow.TotalMinutes;
}
-
+#endif
+
public static MembershipUser CreateUser (string username,
string password)
{
return CreateUser (username, password, null);
Modified:
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Roles.cs
===================================================================
---
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Roles.cs
2006-09-10 15:41:47 UTC (rev 65175)
+++
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web.Security/Roles.cs
2006-09-10 16:09:19 UTC (rev 65176)
@@ -37,7 +37,46 @@
namespace System.Web.Security {
public static class Roles {
+#if TARGET_J2EE
+ const string Roles_cookie_protection =
"Roles.cookie_protection";
+ private static CookieProtection cookie_protection {
+ get {
+ object o = AppDomain.CurrentDomain.GetData
(Roles_cookie_protection);
+ if (o == null) {
+ lock (AppDomain.CurrentDomain) {
+ o =
AppDomain.CurrentDomain.GetData (Roles_cookie_protection);
+ if (o == null) {
+ cookie_protection =
CookieProtection.All;
+ return
cookie_protection;
+ }
+ }
+ }
+ return (CookieProtection) o;
+ }
+
+ set {
+ AppDomain.CurrentDomain.SetData
(Roles_cookie_protection, value);
+ }
+ }
+
+ private static RoleManagerSection config {
+ get {
+ return (RoleManagerSection)
WebConfigurationManager.GetSection ("system.web/roleManager");
+ }
+ }
+
+ const string Roles_providersCollection =
"Roles.providersCollection";
+ static RoleProviderCollection providersCollection {
+ get {
+ return
(RoleProviderCollection)AppDomain.CurrentDomain.GetData
(Roles_providersCollection);
+ }
+
+ set {
+ AppDomain.CurrentDomain.SetData
(Roles_providersCollection, value);
+ }
+ }
+#else
private static CookieProtection cookie_protection;
private static RoleManagerSection config;
static RoleProviderCollection providersCollection;
@@ -49,6 +88,7 @@
config =
(RoleManagerSection)WebConfigurationManager.GetSection
("system.web/roleManager");
}
+#endif
public static void AddUsersToRole (string [] usernames, string
rolename)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches