Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@@ -54,11 +54,9 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AllowPartiallyTrustedCallers]
#if !TARGET_JVM
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
#endif
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]

View File

@@ -50,19 +50,7 @@ namespace System.Web.Services.Configuration
class WSConfig
{
#if !TARGET_JVM
volatile static WSConfig instance;
#else
static WSConfig instance {
get {
return (WSConfig)AppDomain.CurrentDomain.GetData("WSConfig.instance");
}
set {
AppDomain.CurrentDomain.SetData("WSConfig.instance", value);
}
}
#endif
WSProtocol protocols;
string wsdlHelpPage;
string filePath;

View File

@@ -35,9 +35,7 @@ using System.Xml;
namespace System.Web.Services.Description {
public sealed class ServiceDescriptionCollection : ServiceDescriptionBaseCollection {
#if !TARGET_JVM //code generation is not supported
ServiceDescriptionImporter importer;
#endif
#region Constructors
@@ -69,12 +67,10 @@ namespace System.Web.Services.Description {
#endregion // Properties
#region Methods
#if !TARGET_JVM //code generation is not supported
internal void SetImporter (ServiceDescriptionImporter i)
{
importer = i;
}
#endif
public int Add (ServiceDescription serviceDescription)
{
Insert (Count, serviceDescription);

View File

@@ -2479,7 +2479,6 @@ namespace System.Web.Services.Description
}
}
#if !TARGET_JVM
internal class XmlSerializerContract : System.Xml.Serialization.XmlSerializerImplementation
{
System.Collections.Hashtable readMethods = null;
@@ -2550,7 +2549,6 @@ namespace System.Web.Services.Description
}
}
#endif
}
#endif

View File

@@ -35,18 +35,7 @@ namespace System.Web.Services.Description {
public abstract class SoapTransportImporter {
#region Fields
#if !TARGET_JVM
static ArrayList transportImporters;
#else
static ArrayList transportImporters {
get {
return (ArrayList)AppDomain.CurrentDomain.GetData("SoapTransportImporter.transportImporters");
}
set {
AppDomain.CurrentDomain.SetData("SoapTransportImporter.transportImporters", value);
}
}
#endif
SoapProtocolImporter importContext;
#endregion // Fields

View File

@@ -100,10 +100,8 @@ namespace System.Web.Services.Protocols
string physPath = Path.Combine (path, help);
#if !TARGET_JVM
if (!File.Exists (physPath))
throw new InvalidOperationException ("Documentation page '" + physPath + "' not found");
#endif
_pageHandler = PageParser.GetCompiledPageInstance (vpath, physPath, context);
}
@@ -137,11 +135,7 @@ namespace System.Web.Services.Protocols
if (key == "wsdl") GenerateWsdlDocument (context, req.QueryString ["wsdl"]);
else if (key == "schema") GenerateSchema (context, req.QueryString ["schema"]);
#if !TARGET_JVM //code generation is not supported
else if (key == "code") GenerateCode (context, req.QueryString ["code"]);
#else
else if (key == "code") throw new Exception("Code generation is not supported.");
#endif
else if (key == "disco") GenerateDiscoDocument (context);
else throw new Exception ("This should never happen");
}
@@ -212,7 +206,6 @@ namespace System.Web.Services.Protocols
GetSchemas() [di].Write (xtw);
}
#if !TARGET_JVM
void GenerateCode (HttpContext context, string langId)
{
context.Response.ContentType = "text/plain; charset=utf-8";
@@ -256,7 +249,6 @@ namespace System.Web.Services.Protocols
return provider;
}
#endif
internal ServiceDescriptionCollection GetDescriptions ()
{

View File

@@ -62,18 +62,7 @@ namespace System.Web.Services.Protocols {
public abstract void ProcessMessage (SoapMessage message);
#if !TARGET_JVM
static ArrayList[] globalExtensions;
#else
static ArrayList[] globalExtensions {
get {
return (ArrayList[])AppDomain.CurrentDomain.GetData("SoapExtension.globalExtensions");
}
set {
AppDomain.CurrentDomain.SetData("SoapExtension.globalExtensions", value);
}
}
#endif
internal static SoapExtension[] CreateExtensionChain (SoapExtensionRuntimeConfig[] extensionConfigs)
{

View File

@@ -280,28 +280,7 @@ namespace System.Web.Services.Protocols {
//
internal class TypeStubManager
{
#if !TARGET_JVM
static Hashtable type_to_manager;
#else
const string type_to_manager_key = "TypeStubManager.type_to_manager";
static Hashtable type_to_manager {
get {
Hashtable hash = (Hashtable)AppDomain.CurrentDomain.GetData(type_to_manager_key);
if (hash != null)
return hash;
lock(type_to_manager_key) {
AppDomain.CurrentDomain.SetData(type_to_manager_key, new Hashtable());
}
return (Hashtable)AppDomain.CurrentDomain.GetData(type_to_manager_key);
}
set {
//do nothing: we manage our type_to_manager per domain
}
}
#endif
static TypeStubManager ()
{

View File

@@ -59,18 +59,7 @@ namespace System.Web.Services.Protocols {
//
WebRequest current_request;
#if !TARGET_JVM
static HybridDictionary cache;
#else
static HybridDictionary cache {
get {
return (HybridDictionary)AppDomain.CurrentDomain.GetData("WebClientProtocol.cache");
}
set {
AppDomain.CurrentDomain.SetData("WebClientProtocol.cache", value);
}
}
#endif
#endregion
#region Constructors

View File

@@ -106,7 +106,7 @@ namespace System.Web.Services.Protocols
#endif
Type type;
#if NET_2_0 && !TARGET_JVM
#if NET_2_0
type = BuildManager.GetCompiledType (url);
#else
type = WebServiceParser.GetCompiledType (fp, context);