Author: mhabersack
Date: 2007-12-07 18:10:07 -0500 (Fri, 07 Dec 2007)
New Revision: 90970
Added:
trunk/mono/data/net_2_0/settings.map
Modified:
trunk/mono/data/net_2_0/ChangeLog
trunk/mono/data/net_2_0/Makefile.am
trunk/mono/data/net_2_0/machine.config
Log:
2007-12-08 Marek Habersack <[EMAIL PROTECTED]>
* machine.config: updated the LocalSqlServer connection string to
match MS.NET and added a new connection string, LocalSqliteServer,
to be used by default on Unix.
Updated the AspNetSqlMembershipProvider definition to match
MS.NET.
* settings.map: added
* Makefile.am: added settings.map
Modified: trunk/mono/data/net_2_0/ChangeLog
===================================================================
--- trunk/mono/data/net_2_0/ChangeLog 2007-12-07 23:00:35 UTC (rev 90969)
+++ trunk/mono/data/net_2_0/ChangeLog 2007-12-07 23:10:07 UTC (rev 90970)
@@ -1,3 +1,15 @@
+2007-12-08 Marek Habersack <[EMAIL PROTECTED]>
+
+ * machine.config: updated the LocalSqlServer connection string to
+ match MS.NET and added a new connection string, LocalSqliteServer,
+ to be used by default on Unix.
+ Updated the AspNetSqlMembershipProvider definition to match
+ MS.NET.
+
+ * settings.map: added
+
+ * Makefile.am: added settings.map
+
2007-10-17 Atsushi Enomoto <[EMAIL PROTECTED]>
* web.config, machine.config: moved webSerices section from former
Modified: trunk/mono/data/net_2_0/Makefile.am
===================================================================
--- trunk/mono/data/net_2_0/Makefile.am 2007-12-07 23:00:35 UTC (rev 90969)
+++ trunk/mono/data/net_2_0/Makefile.am 2007-12-07 23:10:07 UTC (rev 90970)
@@ -2,9 +2,11 @@
EXTRA_DIST = machine.config \
web.config \
- DefaultWsdlHelpGenerator.aspx
+ DefaultWsdlHelpGenerator.aspx \
+ settings.map
mono_DATA = machine.config \
web.config \
- DefaultWsdlHelpGenerator.aspx
+ DefaultWsdlHelpGenerator.aspx \
+ settings.map
Modified: trunk/mono/data/net_2_0/machine.config
===================================================================
--- trunk/mono/data/net_2_0/machine.config 2007-12-07 23:00:35 UTC (rev
90969)
+++ trunk/mono/data/net_2_0/machine.config 2007-12-07 23:10:07 UTC (rev
90970)
@@ -82,9 +82,10 @@
<section name="system.webServer"
type="System.Configuration.IgnoreSection, System.Configuration,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</configSections>
-<!-- <connectionStrings>
- <add name="LocalSqlServer" connectionString="Data
Source=|DataDirectory|/aspnetdb.sqlite;create=true;version=3"
providerName="Mono.Data.SqliteClient"/>
- </connectionStrings> -->
+ <connectionStrings>
+ <add name="LocalSqlServer" connectionString="data
source=.\SQLEXPRESS;Integrated
Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true"
providerName="System.Data.SqlClient"/>
+ <add name="LocalSqliteServer" connectionString="Data
Source=|DataDirectory|/aspnetdb.sqlite;version=3"
providerName="Mono.Data.Sqlite"/>
+ </connectionStrings>
<configProtectedData
defaultProvider="RsaProtectedConfigurationProvider">
<providers>
@@ -161,8 +162,11 @@
<system.data>
<DbProviderFactories>
<add name="Mono Sqlite Data Provider"
invariant="Mono.Data.SqliteClient"
- description="Mono Framework Data Provider for SQLite"
+ description="Mono Framework Data Provider for SQLite (old
version)"
type="Mono.Data.SqliteClient.SqliteFactory,
Mono.Data.SqliteClient, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756"/>
+ <add name="Mono Sqlite Provider" invariant="Mono.Data.Sqlite"
+ description="Mono Framework Data Provider for SQLite (new
version)"
+ type="Mono.Data.Sqlite.SqliteFactory, Mono.Data.Sqlite,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
<add name="Odbc Data Provider" invariant="System.Data.Odbc"
description=".Net Framework Data Provider for Odbc"
type="System.Data.Odbc.OdbcFactory, System.Data,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
@@ -222,7 +226,7 @@
<membership>
<providers>
- <add name="AspNetSqlMembershipProvider"
type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" applicationName="/"
connectionStringName="LocalSqlServer" />
+ <add name="AspNetSqlMembershipProvider"
type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
connectionStringName="LocalSqlServer" enablePasswordRetrieval="false"
enablePasswordReset="true" requiresQuestionAndAnswer="true" applicationName="/"
requiresUniqueEmail="false" passwordFormat="Hashed"
maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7"
minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10"
passwordStrengthRegularExpression=""/>
<!-- <add name="AspNetSqlMembershipProvider"
type="Mainsoft.Web.Security.GenericMembershipProvider, Mainsoft.Web.Security"
applicationName="/" connectionStringName="LocalSqlServer" /> -->
</providers>
</membership>
Added: trunk/mono/data/net_2_0/settings.map
===================================================================
--- trunk/mono/data/net_2_0/settings.map 2007-12-07 23:00:35 UTC (rev
90969)
+++ trunk/mono/data/net_2_0/settings.map 2007-12-07 23:10:07 UTC (rev
90970)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settingsMap>
+ <map sectionType="System.Web.Configuration.MembershipSection, System.Web,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ mapperType="System.Web.Util.MembershipSectionMapper, System.Web,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ platform="Unix">
+
+ <!-- The 'what' tag specifies which region of the section to modify. The
'value' attribute value is mapper-specific and is not defined here. It can be
+ any expression understood by the mapper to designate the section
region to modify.
+ -->
+ <what value="providers">
+ <!-- 'what' can contain any number of occurrences of any three elements:
+ replace - replace the designated region
+ add - add a new entry to the region
+ clear - clear the region
+ remove - remove the designatedregion
+
+ The attributes to any of the above are freeform and are not
processed by the mapper manager. They are stored verbatim for the
+ mapper to peruse.
+ -->
+ <replace name="AspNetSqlMembershipProvider"
+ type="System.Web.Security.SqliteMembershipProvider, System.Web,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ connectionStringName="LocalSqliteServer" />
+ </what>
+ </map>
+
+ <map sectionType="System.Web.Configuration.RoleManagerSection, System.Web,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ mapperType="System.Web.Util.RoleManagerSectionMapper, System.Web,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ platform="Unix">
+
+ <!-- The 'what' tag specifies which region of the section to modify. The
'value' attribute value is mapper-specific and is not defined here. It can be
+ any expression understood by the mapper to designate the section
region to modify.
+ -->
+ <what value="providers">
+ <!-- 'what' can contain any number of occurrences of any three elements:
+ replace - replace the designated region
+ add - add a new entry to the region
+ clear - clear the region
+ remove - remove the designatedregion
+
+ The attributes to any of the above are freeform and are not
processed by the mapper manager. They are stored verbatim for the
+ mapper to peruse.
+ -->
+ <replace name="AspNetSqlRoleProvider"
+ type="System.Web.Security.SqliteRoleProvider, System.Web,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ connectionStringName="LocalSqliteServer" />
+ </what>
+ </map>
+</settingsMap>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
