Backport of r120376.

svn path=/branches/mono-2-2/mcs/; revision=120377

8 files changed, 116 insertions, 3 deletions

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 10fc2736797..b1f6308f05e 100644
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-01  Marek Habersack  <mhabersack@novell.com>
+
+	* Makefile (TEST_RESOURCE_FILES): added
+	Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx
+	Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master 
+	(TEST_MCS_FLAGS): added reference to System.Web.Extensions
+
 2008-11-25  Marek Habersack  <mhabersack@novell.com>
 
 	* System.Web.dll.sources: added
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 76adc94b184..7036d4607e8 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -153,7 +153,9 @@ TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWebResources/ValidPropertyBind4.aspx \
 	Test/mainsoft/NunitWebResources/ReadWritePropertyControl.ascx \
 	Test/mainsoft/MainsoftWebTest/nunitweb_config.xml \
-	Test/mainsoft/NunitWebResources/TemplateControlParsingTest.aspx
+	Test/mainsoft/NunitWebResources/TemplateControlParsingTest.aspx \
+	Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx \
+	Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master
 
 RESX_DIST =  resources/TranslationResources.resx
 ifeq (net_2_0, $(PROFILE))
@@ -191,7 +193,7 @@ echo-warning:
 endif
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml)  -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%)
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.Web.Extensions.dll -doc:$(test_lib:.dll=.xml)  -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) $(TEST_RESOURCE_FILES) UplevelHelperDefinitions.xml $(RESX_DIST) \
 		  SQLiteProviders_DatabaseSchema.sql
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog
index aa7237941db..485a761fd4d 100644
--- a/mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-01  Marek Habersack  <mhabersack@novell.com>
+
+	* TemplateControlCompilerTest.cs: Added test for bug #449970
+
 2008-11-21  Marek Habersack  <mhabersack@novell.com>
 
 	* TemplateControlCompilerTest.cs: added simple data source for
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
index d5b1efcee2c..2e0bddaae92 100644
--- a/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
@@ -62,6 +62,8 @@ namespace MonoTests.System.Web.Compilation {
 			WebTest.CopyResource (GetType (), "ValidPropertyBind3.aspx", "ValidPropertyBind3.aspx");
 			WebTest.CopyResource (GetType (), "ValidPropertyBind4.aspx", "ValidPropertyBind4.aspx");
 			WebTest.CopyResource (GetType (), "ReadWritePropertyControl.ascx", "ReadWritePropertyControl.ascx");
+			WebTest.CopyResource (GetType (), "ContentPlaceHolderInTemplate.aspx", "ContentPlaceHolderInTemplate.aspx");
+			WebTest.CopyResource (GetType (), "ContentPlaceHolderInTemplate.master", "ContentPlaceHolderInTemplate.master");
 #endif
 		}
 		
@@ -76,6 +78,13 @@ namespace MonoTests.System.Web.Compilation {
 		}
 
 #if NET_2_0
+		// Test for bug #449970
+		[Test]
+		public void MasterPageContentPlaceHolderInTemplate ()
+		{
+			new WebTest ("ContentPlaceHolderInTemplate.aspx").Run ();
+		}
+		
 		[Test]
 		[ExpectedException (typeof (CompilationException))]
 		public void InvalidPropertyBindTest1 ()
diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog
index 6a0ca0dbf3a..ef228aae539 100644
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-01  Marek Habersack  <mhabersack@novell.com>
+
+	* Web.mono.config: added ASP.NET AJAX 1.0 configuration entries
+
 2008-11-21  Marek Habersack  <mhabersack@novell.com>
 
 	* Web.config, Web.mono.config: disabled batch compilation.
diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config
index 585d4f39be8..106f894a1ab 100755
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>

 <configuration>

+  <configSections>

+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">

+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">

+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>

+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">

+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="Everywhere"/>

+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>

+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>

+				</sectionGroup>

+			</sectionGroup>

+		</sectionGroup>

+	</configSections>

   <appSettings>

     <add key="strvalue" value="str" />

     <add key="intvalue" value="123" />

@@ -7,11 +19,22 @@
   <system.web>

     <siteMap enabled="true"/>

     <compilation debug="true" batch="false">

+	<assemblies>

+		<add assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>

+	</assemblies>

     </compilation>

     <httpHandlers>

       <add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />

+      <remove verb="*" path="*.asmx"/>

+      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>

+      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>

+      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>

     </httpHandlers>

-    <pages enableSessionState="false" />

+    <pages enableSessionState="false">

+			<controls>

+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>

+			</controls>

+    </pages>

     <membership defaultProvider="FakeProvider">

       <providers>

         <add name="FakeProvider" type="MonoTests.SystemWeb.Framework.FakeMembershipProvider"

@@ -23,6 +46,35 @@
       </providers>

     </membership>

   </system.web>

+	<system.web.extensions>

+		<scripting>

+			<webServices>

+				<!-- Uncomment this line to customize maxJsonLength and add a custom converter -->

+				<!--

+      <jsonSerialization maxJsonLength="500">

+        <converters>

+          <add name="ConvertMe" type="Acme.SubAcme.ConvertMeTypeConverter"/>

+        </converters>

+      </jsonSerialization>

+      -->

+				<!-- Uncomment this line to enable the authentication service. Include requireSSL="true" if appropriate. -->

+				<!--

+        <authenticationService enabled="true" requireSSL = "true|false"/>

+      -->

+				<!-- Uncomment these lines to enable the profile service. To allow profile properties to be retrieved

+           and modified in ASP.NET AJAX applications, you need to add each property name to the readAccessProperties and

+           writeAccessProperties attributes. -->

+				<!--

+      <profileService enabled="true"

+                      readAccessProperties="propertyname1,propertyname2"

+                      writeAccessProperties="propertyname1,propertyname2" />

+      -->

+			</webServices>

+			<!--

+      <scriptResourceHandler enableCompression="true" enableCaching="true" />

+      -->

+		</scripting>

+	</system.web.extensions>

   <system.net>

     <mailSettings>

       <smtp from="heh@heh.com">

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx
new file mode 100644
index 00000000000..f08979a550c
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx
@@ -0,0 +1,9 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/ContentPlaceHolderInTemplate.master" AutoEventWireup="true" %>

+

+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">

+    Head content

+</asp:Content>

+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">

+    Placeholder content.

+</asp:Content>

+

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master
new file mode 100644
index 00000000000..291bf96eee3
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master
@@ -0,0 +1,26 @@
+<%@ Master Language="C#" AutoEventWireup="true" %>

+

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head runat="server">

+    <title></title>

+    <asp:ContentPlaceHolder id="head" runat="server">

+    </asp:ContentPlaceHolder>

+</head>

+<body>

+    <form id="form1" runat="server">

+    <asp:ScriptManager ID="ScriptManager1" runat="server">

+    </asp:ScriptManager>

+    

+    <div>

+        <asp:UpdatePanel ID="UpdatePanel1" runat="server">

+            <ContentTemplate>

+                <asp:ContentPlaceHolder id="ContentPlaceHolder1" runat="server">

+                </asp:ContentPlaceHolder>

+            </ContentTemplate>

+        </asp:UpdatePanel>

+    </div>

+    </form>

+</body>

+</html>