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

	* data/net_2_0/Makefile.am (EXTRA_DIST): add web.config
	(mono_DATA): same.

	* data/net_2_0/machine.config: remove the system.web section from
	here.

	* data/net_2_0/web.config: and add it here.


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

3 files changed, 95 insertions, 87 deletions

diff --git a/data/net_2_0/Makefile.am b/data/net_2_0/Makefile.am
index b17d1fd9144..863556e18f0 100644
--- a/data/net_2_0/Makefile.am
+++ b/data/net_2_0/Makefile.am
@@ -1,8 +1,10 @@
 monodir = $(sysconfdir)/mono/2.0
 
 EXTRA_DIST =  machine.config \
-	     DefaultWsdlHelpGenerator.aspx
+	      web.config \
+	      DefaultWsdlHelpGenerator.aspx
 
 mono_DATA =  machine.config \
+	     web.config \
 	     DefaultWsdlHelpGenerator.aspx
 
diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index 56666acc9d8..a36b8df7732 100644
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -86,92 +86,6 @@
 			<ipv6 enabled="false"/>
 		</settings>
 	</system.net>
-	<system.web>
-		<authorization>
-			<allow users="*" />
-		</authorization>
-		<httpHandlers>
-			<add verb="*" path="Trace.axd" type="System.Web.Handlers.TraceHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.aspx" type="System.Web.UI.PageHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.asmx" validate="false" type="System.Web.Services.Protocols.WebServiceHandlerFactory, System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.ashx" type="System.Web.UI.SimpleHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="GET" path="WebResource.axd" type="System.Web.Handlers.AssemblyResourceLoader, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.Config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*.dll" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-	      	<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
-      		<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
-			<add verb="GET,HEAD" path="*" type="System.Web.StaticFileHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add verb="*" path="*" type="System.Web.HttpMethodNotAllowedHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-		</httpHandlers>
-		<httpModules>
-			<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add name="Session" type="System.Web.SessionState.SessionStateModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			<add name="OutputCache" type="System.Web.Caching.OutputCacheModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-		</httpModules>
-		<authentication mode="Forms">
-			<forms name=".MONOAUTH" loginUrl="login.aspx" protection="All" timeout="30" path="/">
-				<credentials passwordFormat="Clear">
-					<!--<user name="gonzalo" password="gonz"/>-->
-				</credentials>
-			</forms>
-		</authentication>
-		<machineKey validationKey="AutoGenerate" decryptionKey="AutoGenerate" validation="SHA1" />
-		<globalization  requestEncoding="utf-8"
-				responseEncoding="utf-8"
-				fileEncoding="utf-8"/>
-		<!--
-				culture="en-US"
-				uiculture="en-US" />
-		-->
-		<sessionState mode="InProc" />
-		<webServices>
-			<protocols>
-				<add name="HttpSoap"/>
-				<add name="HttpPost"/>
-				<add name="HttpGet"/>
-				<add name="Documentation"/>
-			</protocols>
-			<wsdlHelpGenerator href="DefaultWsdlHelpGenerator.aspx" />
-		</webServices>
-		<webControls clientScriptsLocation="/web_scripts" />
-		<compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
-			<compilers>
-			<compiler language="cs;c#;csharp" extension=".cs" warningLevel="1" compilerOptions=""
-				  type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-			<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
-				  warningLevel="1" compilerOptions=""
-				  type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-			</compilers>
-			<assemblies>
-				<!--<add assembly="mscorlib" /> -->
-				<add assembly="System" />
-				<add assembly="System.Xml" />
-				<add assembly="System.Configuration" />
-				<add assembly="System.Data" />
-				<add assembly="System.Web" />
-				<add assembly="System.Web.Services" />
-				<add assembly="System.Drawing" />
-				<add assembly="*" /> <!-- Add assemblies in bin directory -->
-			</assemblies>
-		</compilation>
-		<httpRuntime executionTimeout="90"
-			     maxRequestLength="4096"
-			     useFullyQualifiedRedirectUrl="false"
-			     minFreeThreads="8"
-			     minLocalRequestFreeThreads="4"
-			     appRequestQueueLimit="100" />
-		<clientTarget>
-			<add alias="ie5" userAgent="Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)" />
-			<add alias="ie4" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
-			<add alias="uplevel" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
-			<add alias="downlevel" userAgent="Unknown" />
-		</clientTarget>
-	</system.web>
 	
 	<system.runtime.remoting>
 		<application>
diff --git a/data/net_2_0/web.config b/data/net_2_0/web.config
new file mode 100644
index 00000000000..749965bce4e
--- /dev/null
+++ b/data/net_2_0/web.config
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+
+	<system.web>
+		<authorization>
+			<allow users="*" />
+		</authorization>
+		<httpHandlers>
+			<add verb="*" path="Trace.axd" type="System.Web.Handlers.TraceHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.aspx" type="System.Web.UI.PageHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.asmx" validate="false" type="System.Web.Services.Protocols.WebServiceHandlerFactory, System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.ashx" type="System.Web.UI.SimpleHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="GET" path="WebResource.axd" type="System.Web.Handlers.AssemblyResourceLoader, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.Config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*.dll" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+	      	<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
+      		<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
+			<add verb="GET,HEAD" path="*" type="System.Web.StaticFileHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add verb="*" path="*" type="System.Web.HttpMethodNotAllowedHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+		</httpHandlers>
+		<httpModules>
+			<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add name="Session" type="System.Web.SessionState.SessionStateModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			<add name="OutputCache" type="System.Web.Caching.OutputCacheModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+		</httpModules>
+		<authentication mode="Forms">
+			<forms name=".MONOAUTH" loginUrl="login.aspx" protection="All" timeout="30" path="/">
+				<credentials passwordFormat="Clear">
+					<!--<user name="gonzalo" password="gonz"/>-->
+				</credentials>
+			</forms>
+		</authentication>
+		<machineKey validationKey="AutoGenerate" decryptionKey="AutoGenerate" validation="SHA1" />
+		<globalization  requestEncoding="utf-8"
+				responseEncoding="utf-8"
+				fileEncoding="utf-8"/>
+		<!--
+				culture="en-US"
+				uiculture="en-US" />
+		-->
+		<sessionState mode="InProc" />
+		<webServices>
+			<protocols>
+				<add name="HttpSoap"/>
+				<add name="HttpPost"/>
+				<add name="HttpGet"/>
+				<add name="Documentation"/>
+			</protocols>
+			<wsdlHelpGenerator href="DefaultWsdlHelpGenerator.aspx" />
+		</webServices>
+		<webControls clientScriptsLocation="/web_scripts" />
+		<compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
+			<compilers>
+			<compiler language="cs;c#;csharp" extension=".cs" warningLevel="1" compilerOptions=""
+				  type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+			<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
+				  warningLevel="1" compilerOptions=""
+				  type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+			</compilers>
+			<assemblies>
+				<!--<add assembly="mscorlib" /> -->
+				<add assembly="System" />
+				<add assembly="System.Xml" />
+				<add assembly="System.Configuration" />
+				<add assembly="System.Data" />
+				<add assembly="System.Web" />
+				<add assembly="System.Web.Services" />
+				<add assembly="System.Drawing" />
+				<add assembly="*" /> <!-- Add assemblies in bin directory -->
+			</assemblies>
+		</compilation>
+		<httpRuntime executionTimeout="90"
+			     maxRequestLength="4096"
+			     useFullyQualifiedRedirectUrl="false"
+			     minFreeThreads="8"
+			     minLocalRequestFreeThreads="4"
+			     appRequestQueueLimit="100" />
+		<clientTarget>
+			<add alias="ie5" userAgent="Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)" />
+			<add alias="ie4" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
+			<add alias="uplevel" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
+			<add alias="downlevel" userAgent="Unknown" />
+		</clientTarget>
+	</system.web>
+
+</configuration>