Merge branch 'master' of github.com:mono/mono

[mono.git] / mcs / class / System.Web / System.Web.UI / WebServiceParser.cs

diff --git a/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs b/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs
index 8d40bf77c282dc9567d396a4da5372bf84f7a581..8a2e62cc805c0d2472f547e2ae4b5aa06a309343 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/WebServiceParser.cs
@@ -5,28 +5,57 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2002 Ximian, Inc (http://www.ximian.com)
+// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System.Web;
+using System.IO;
+using System.Security.Permissions;
 using System.Web.Compilation;
 
 namespace System.Web.UI
 {
+       // CAS
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        public class WebServiceParser : SimpleWebHandlerParser
        {
-               private WebServiceParser (HttpContext context, string virtualPath, string physicalPath)
+               WebServiceParser (HttpContext context, string virtualPath, string physicalPath)
                        : base (context, virtualPath, physicalPath)
                {
                }
 
-               public static Type GetCompiledType (string inputFile, HttpContext context)
+               internal WebServiceParser (HttpContext context, VirtualPath virtualPath, TextReader reader)
+                       : this (context, virtualPath, null, reader)
+               {
+               }
+               
+               internal WebServiceParser (HttpContext context, VirtualPath virtualPath, string physicalPath, TextReader reader)
+                       : base (context, virtualPath.Original, physicalPath, reader)
                {
-                       WebServiceParser parser = new WebServiceParser (context, null, inputFile);
-                       Type type = parser.GetCompiledTypeFromCache ();
-                       if (type != null)
-                               return type;
+               }
 
-                       return WebServiceCompiler.CompileIntoType (parser);
+               public static Type GetCompiledType (string inputFile, HttpContext context)
+               {
+                       return BuildManager.GetCompiledType (inputFile);
                }
 
                protected override string DefaultDirectiveName {