2007-12-08 Marek Habersack <mhabersack@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Fri, 7 Dec 2007 23:10:07 +0000 (23:10 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Fri, 7 Dec 2007 23:10:07 +0000 (23:10 -0000)
* 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

svn path=/trunk/mono/; revision=90970

data/net_2_0/ChangeLog
data/net_2_0/Makefile.am
data/net_2_0/machine.config
data/net_2_0/settings.map [new file with mode: 0644]

index 7ea221e104899ee796529d11e10ba52c3ac785fe..375c23219a6f9c61c8fbdca7738d107790e75eab 100644 (file)
@@ -1,3 +1,15 @@
+2007-12-08  Marek Habersack  <mhabersack@novell.com>
+
+       * 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  <atsushi@ximian.com>
 
        * web.config, machine.config: moved webSerices section from former
index 863556e18f0e32876bdb5c6a39b9ee43c571466e..a9ae78aaf44bdf32537a3af9ca7aa2fdc74d656b 100644 (file)
@@ -2,9 +2,11 @@ monodir = $(sysconfdir)/mono/2.0
 
 EXTRA_DIST =  machine.config \
              web.config \
-             DefaultWsdlHelpGenerator.aspx
+             DefaultWsdlHelpGenerator.aspx \
+             settings.map
 
 mono_DATA =  machine.config \
             web.config \
-            DefaultWsdlHelpGenerator.aspx
+            DefaultWsdlHelpGenerator.aspx \
+            settings.map
 
index 78988e8640315d8d4f126bba1dcac5b2659e6e8a..4dfffc107e208e3d321f61a974c5baa8df73ef9f 100644 (file)
                <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>
        <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"/>
 
                <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>
diff --git a/data/net_2_0/settings.map b/data/net_2_0/settings.map
new file mode 100644 (file)
index 0000000..b896605
--- /dev/null
@@ -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>