projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2d68ee 1b63b16)
2008-12-02 Marek Habersack <mhabersack@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Tue, 2 Dec 2008 01:31:10 +0000 (01:31 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Tue, 2 Dec 2008 01:31:10 +0000 (01:31 -0000)
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1

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

* WebTest.cs: for 1.1, copy the Web.mono.config.1.1 resource

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

* Web.config: added ASP.NET AJAX 1.0 configuration entries
* Web.config.1.1: copied from the last revision before the above
changes, so that 1.1 tests don't fail.
* Web.mono.config.1.1: copied from revision before the AJAX
changes below, so that 1.1 tests don't fail.

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

1  2 
mcs/class/System.Web/ChangeLog patch | diff1 | diff2 | blob | history
mcs/class/System.Web/Makefile patch | diff1 | diff2 | blob | history
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/ChangeLog patch | diff1 | diff2 | blob | history
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog patch | diff1 | diff2 | blob | history
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config patch | diff1 | diff2 | blob | history
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config.1.1 patch | | | blob
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1 patch | | | blob
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs patch | diff1 | diff2 | blob | history

diff --cc mcs/class/System.Web/ChangeLog
index b1f6308f05e5725109083d790dbc05c43708aaa7,10fc2736797683207d62a96a85e5de78fd10c6a3..9b3aa44850d698779d37fbc1b1932ce909ee02b2
--- 1/mcs/class/System.Web/ChangeLog
--- 2/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@@ -1,10 -1,3 +1,15 @@@
++2008-12-02  Marek Habersack  <mhabersack@novell.com>
++
++      * Makefile (TEST_RESOURCE_FILES): added
++      Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1
++
 +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 --cc mcs/class/System.Web/Makefile
index 301401332ae0778fea22c9114c40c21356c16c2d,76adc94b184cc56f93305cd110cf532734f4251a..d445839190d6c6e17516325b49a2ff98ed4acd43
--- 1/mcs/class/System.Web/Makefile
--- 2/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@@ -80,6 -80,6 +80,7 @@@ TEST_RESOURCE_FILES = 
        Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config \
++      Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1 \
        Test/mainsoft/NunitWebResources/menuclass.aspx \
        Test/mainsoft/NunitWebResources/FormView.aspx \
        Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/ChangeLog
index b56bf4f58d2c36e87589439da7b7dc0a037e063d,b56bf4f58d2c36e87589439da7b7dc0a037e063d..f84076d810adfcbb0eab7601e497758a624c4063
--- 1/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/ChangeLog
--- 2/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/ChangeLog
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/ChangeLog
@@@ -1,3 -1,3 +1,7 @@@
++2008-12-02  Marek Habersack  <mhabersack@novell.com>
++
++      * WebTest.cs: for 1.1, copy the Web.mono.config.1.1 resource
++
  2008-10-09  Marek Habersack  <mhabersack@novell.com>
  
        * WebTest.cs: made the Host property internal. It is used to
diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog
index ef228aae539815f0a85afb2e9225531476ca330f,6a0ca0dbf3aec952fb319ea0a8b3faf2bf4137d3..31f1d7f72fd24ddbbb2ebab7ee00de1acd007902
--- 1/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog
--- 2/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/ChangeLog
@@@ -1,7 -1,3 +1,15 @@@
++2008-12-02  Marek Habersack  <mhabersack@novell.com>
++
++      * Web.config: added ASP.NET AJAX 1.0 configuration entries
++      * Web.config.1.1: copied from the last revision before the above
++      changes, so that 1.1 tests don't fail.
++      * Web.mono.config.1.1: copied from revision before the AJAX
++      changes below, so that 1.1 tests don't fail.
++
 +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 --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config
index c3f9815ddf684cc73da37c57b523eed5f64ccf7f,c3f9815ddf684cc73da37c57b523eed5f64ccf7f..2e7c4df8ba53145616bdc22c9c59d9566d2060cd
--- 1/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config
--- 2/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config
@@@ -1,5 -1,5 +1,18 @@@
  <?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
++\r
    <appSettings>\r
      <add key="strvalue" value="str" />\r
      <add key="intvalue" value="123" />\r
@@@ -7,14 -7,14 +20,25 @@@
    <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
  \r
  \r
  \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
@@@ -26,6 -26,6 +50,36 @@@
        </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
++\r
    <system.net>\r
      <mailSettings>\r
        <smtp from="heh@heh.com">\r
diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config.1.1
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c3f9815ddf684cc73da37c57b523eed5f64ccf7f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config.1.1
@@@ -1,0 -1,0 +1,36 @@@
++<?xml version="1.0" encoding="utf-8" ?>\r
++<configuration>\r
++  <appSettings>\r
++    <add key="strvalue" value="str" />\r
++    <add key="intvalue" value="123" />\r
++  </appSettings>\r
++  <system.web>\r
++    <siteMap enabled="true"/>\r
++    <compilation debug="true" batch="false">\r
++    </compilation>\r
++\r
++\r
++\r
++    <httpHandlers>\r
++      <add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />\r
++    </httpHandlers>\r
++    <pages enableSessionState="false" />\r
++    <membership defaultProvider="FakeProvider">\r
++      <providers>\r
++        <add name="FakeProvider" type="MonoTests.SystemWeb.Framework.FakeMembershipProvider"\r
++             enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true"\r
++             applicationName="/" requiresUniqueEmail="false" passwordFormat="Hashed"\r
++             maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7"\r
++             minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10"\r
++             passwordStrengthRegularExpression="" />\r
++      </providers>\r
++    </membership>\r
++  </system.web>\r
++  <system.net>\r
++    <mailSettings>\r
++      <smtp from="heh@heh.com">\r
++        <network host="localhost" port="125"/>\r
++      </smtp>\r
++    </mailSettings>\r
++  </system.net>\r
++</configuration>\r
diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..585d4f39be8e7a8b41e0e80f36de524636f31b75
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1
@@@ -1,0 -1,0 +1,33 @@@
++<?xml version="1.0" encoding="utf-8" ?>\r
++<configuration>\r
++  <appSettings>\r
++    <add key="strvalue" value="str" />\r
++    <add key="intvalue" value="123" />\r
++  </appSettings>\r
++  <system.web>\r
++    <siteMap enabled="true"/>\r
++    <compilation debug="true" batch="false">\r
++    </compilation>\r
++    <httpHandlers>\r
++      <add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />\r
++    </httpHandlers>\r
++    <pages enableSessionState="false" />\r
++    <membership defaultProvider="FakeProvider">\r
++      <providers>\r
++        <add name="FakeProvider" type="MonoTests.SystemWeb.Framework.FakeMembershipProvider"\r
++             enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true"\r
++             applicationName="/" requiresUniqueEmail="false" passwordFormat="Hashed"\r
++             maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7"\r
++             minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10"\r
++             passwordStrengthRegularExpression="" />\r
++      </providers>\r
++    </membership>\r
++  </system.web>\r
++  <system.net>\r
++    <mailSettings>\r
++      <smtp from="heh@heh.com">\r
++        <network host="localhost" port="125"/>\r
++      </smtp>\r
++    </mailSettings>\r
++  </system.net>\r
++</configuration>\r
diff --cc mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
index 83e3a414bc6f5bde9100c542734880a17cfcc829,83e3a414bc6f5bde9100c542734880a17cfcc829..2d672887147f243ffca6db744fe080a729689c13
--- 1/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
--- 2/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs
@@@ -520,7 -520,7 +520,11 @@@ namespace MonoTests.SystemWeb.Framewor
                                "MonoTests.SystemWeb.Framework.Resources.My.master",
                                "My.master");
  #else
++#if NET_2_0
                        CopyResource (typeof (WebTest), "Web.mono.config", "Web.config");
++#else
++                      CopyResource (typeof (WebTest), "Web.mono.config.1.1", "Web.config");
++#endif
                        CopyResource (typeof (WebTest), "MyPage.aspx", "MyPage.aspx");
                        CopyResource (typeof (WebTest), "MyPage.aspx.cs", "MyPage.aspx.cs");
                        CopyResource (typeof (WebTest), "MyPageWithMaster.aspx", "MyPageWithMaster.aspx");
my mono mirror. check out Moved to http://github.com/mono/mono