projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b63b16)
2008-12-01 Marek Habersack <mhabersack@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Mon, 1 Dec 2008 19:33:35 +0000 (19:33 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Mon, 1 Dec 2008 19:33:35 +0000 (19:33 -0000)
* NunitWebResources/ContentPlaceHolderInTemplate.master: added

* NunitWebResources/ContentPlaceHolderInTemplate.aspx: added

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-12-01  Marek Habersack  <mhabersack@novell.com>

* Web.mono.config: added ASP.NET AJAX 1.0 configuration entries

2008-12-01  Marek Habersack  <mhabersack@novell.com>

* TemplateControlCompilerTest.cs: Added test for bug #449970

svn path=/trunk/mcs/; revision=120376

mcs/class/System.Web/ChangeLog patch | blob | history
mcs/class/System.Web/Makefile patch | blob | history
mcs/class/System.Web/Test/System.Web.Compilation/ChangeLog patch | blob | history
mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs patch | blob | history
mcs/class/System.Web/Test/mainsoft/ChangeLog patch | blob | history
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog patch | blob | history
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config patch | blob | history
mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx [new file with mode: 0644] patch | blob
mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master [new file with mode: 0644] patch | blob

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 10fc2736797683207d62a96a85e5de78fd10c6a3..b1f6308f05e5725109083d790dbc05c43708aaa7 100644 (file)
--- 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 76adc94b184cc56f93305cd110cf532734f4251a..301401332ae0778fea22c9114c40c21356c16c2d 100644 (file)
--- 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))
@@ -192,6 +194,9 @@ endif
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml)  -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%)
+ifeq (net_2_0, $(PROFILE))
+TEST_MCS_FLAGS += -r:System.Web.Extensions.dll
+endif
 
 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 aa7237941dbf18c7004af3569cc2442fb80ffd03..485a761fd4de8751748a9359be1f1f46bc003f54 100644 (file)
--- 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 d5b1efcee2c15fbd6146336f475ef8ffc9dc5aff..2e0bddaae92fff829964559df8ac417f1d669075 100644 (file)
--- 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/ChangeLog b/mcs/class/System.Web/Test/mainsoft/ChangeLog
index 5b7af0552cbc246367555d5b9068b17dc1c03659..9e958d4c5a31e722f7d26080f4f7a690b4f18de9 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/ChangeLog
+++ b/mcs/class/System.Web/Test/mainsoft/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-01  Marek Habersack  <mhabersack@novell.com>
+
+       * NunitWebResources/ContentPlaceHolderInTemplate.master: added
+
+       * NunitWebResources/ContentPlaceHolderInTemplate.aspx: added
+
 2008-11-21  Marek Habersack  <mhabersack@novell.com>
 
        * NunitWebResources/WebLogin.config,
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 6a0ca0dbf3aec952fb319ea0a8b3faf2bf4137d3..ef228aae539815f0a85afb2e9225531476ca330f 100644 (file)
--- 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 585d4f39be8e7a8b41e0e80f36de524636f31b75..106f894a1ab1780a28f2ac0d857b3b5f9286025c 100755 (executable)
--- 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" ?>\r
 <configuration>\r
+  <configSections>\r
+               <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">\r
+                       <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">\r
+                               <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>\r
+                               <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">\r
+                                       <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="Everywhere"/>\r
+                                       <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>\r
+                                       <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>\r
+                               </sectionGroup>\r
+                       </sectionGroup>\r
+               </sectionGroup>\r
+       </configSections>\r
   <appSettings>\r
     <add key="strvalue" value="str" />\r
     <add key="intvalue" value="123" />\r
@@ -7,11 +19,22 @@
   <system.web>\r
     <siteMap enabled="true"/>\r
     <compilation debug="true" batch="false">\r
+       <assemblies>\r
+               <add assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>\r
+       </assemblies>\r
     </compilation>\r
     <httpHandlers>\r
       <add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />\r
+      <remove verb="*" path="*.asmx"/>\r
+      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>\r
+      <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"/>\r
+      <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"/>\r
     </httpHandlers>\r
-    <pages enableSessionState="false" />\r
+    <pages enableSessionState="false">\r
+                       <controls>\r
+                               <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>\r
+                       </controls>\r
+    </pages>\r
     <membership defaultProvider="FakeProvider">\r
       <providers>\r
         <add name="FakeProvider" type="MonoTests.SystemWeb.Framework.FakeMembershipProvider"\r
@@ -23,6 +46,35 @@
       </providers>\r
     </membership>\r
   </system.web>\r
+       <system.web.extensions>\r
+               <scripting>\r
+                       <webServices>\r
+                               <!-- Uncomment this line to customize maxJsonLength and add a custom converter -->\r
+                               <!--\r
+      <jsonSerialization maxJsonLength="500">\r
+        <converters>\r
+          <add name="ConvertMe" type="Acme.SubAcme.ConvertMeTypeConverter"/>\r
+        </converters>\r
+      </jsonSerialization>\r
+      -->\r
+                               <!-- Uncomment this line to enable the authentication service. Include requireSSL="true" if appropriate. -->\r
+                               <!--\r
+        <authenticationService enabled="true" requireSSL = "true|false"/>\r
+      -->\r
+                               <!-- Uncomment these lines to enable the profile service. To allow profile properties to be retrieved\r
+           and modified in ASP.NET AJAX applications, you need to add each property name to the readAccessProperties and\r
+           writeAccessProperties attributes. -->\r
+                               <!--\r
+      <profileService enabled="true"\r
+                      readAccessProperties="propertyname1,propertyname2"\r
+                      writeAccessProperties="propertyname1,propertyname2" />\r
+      -->\r
+                       </webServices>\r
+                       <!--\r
+      <scriptResourceHandler enableCompression="true" enableCaching="true" />\r
+      -->\r
+               </scripting>\r
+       </system.web.extensions>\r
   <system.net>\r
     <mailSettings>\r
       <smtp from="heh@heh.com">\r
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 (file)
index 0000000..f08979a
--- /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" %>\r
+\r
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">\r
+    Head content\r
+</asp:Content>\r
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">\r
+    Placeholder content.\r
+</asp:Content>\r
+\r
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 (file)
index 0000000..291bf96
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master
@@ -0,0 +1,26 @@
+<%@ Master Language="C#" AutoEventWireup="true" %>\r
+\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+\r
+<html xmlns="http://www.w3.org/1999/xhtml">\r
+<head runat="server">\r
+    <title></title>\r
+    <asp:ContentPlaceHolder id="head" runat="server">\r
+    </asp:ContentPlaceHolder>\r
+</head>\r
+<body>\r
+    <form id="form1" runat="server">\r
+    <asp:ScriptManager ID="ScriptManager1" runat="server">\r
+    </asp:ScriptManager>\r
+    \r
+    <div>\r
+        <asp:UpdatePanel ID="UpdatePanel1" runat="server">\r
+            <ContentTemplate>\r
+                <asp:ContentPlaceHolder id="ContentPlaceHolder1" runat="server">\r
+                </asp:ContentPlaceHolder>\r
+            </ContentTemplate>\r
+        </asp:UpdatePanel>\r
+    </div>\r
+    </form>\r
+</body>\r
+</html>\r
my mono mirror. check out Moved to http://github.com/mono/mono