X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem%2FAppDomainManager.cs;h=301fd334c70ef1c2c3aaf5aeb8f4725eaae2e79e;hb=d899b02874a476290f6e8cd54d40e0eaba2ecf04;hp=7659eac85d8fe1e47e36e4e23d3a0f61d393f8db;hpb=1c936e41a89b9491565b5c32fa43ddd2216022de;p=mono.git

diff --git a/mcs/class/corlib/System/AppDomainManager.cs b/mcs/class/corlib/System/AppDomainManager.cs
index 7659eac85d8..301fd334c70 100644
--- a/mcs/class/corlib/System/AppDomainManager.cs
+++ b/mcs/class/corlib/System/AppDomainManager.cs
@@ -4,7 +4,7 @@
 // Author:
 //	Sebastien Pouliot  <sebastien@ximian.com>
 //
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005,2009 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
@@ -26,51 +26,51 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.Reflection;
+using System.Runtime.Hosting;
+using System.Runtime.InteropServices;
 using System.Security;
+using System.Security.Permissions;
 using System.Security.Policy;
 using System.Threading;
 
 namespace System {
 
+#if MONO_FEATURE_MULTIPLE_APPDOMAINS
+	[ComVisible (true)]
+	[SecurityPermission (SecurityAction.LinkDemand, Infrastructure = true)]
+	[SecurityPermission (SecurityAction.InheritanceDemand, Infrastructure = true)]
 	public class AppDomainManager : MarshalByRefObject {
-
 		private ApplicationActivator _activator;
-		private Assembly _entry;
-		private HostExecutionContextManager _host_context;
-		private HostSecurityManager _host_security;
-		private DomainManagerInitializationFlags _flags;
+		private AppDomainManagerInitializationOptions _flags;
 
 		public AppDomainManager ()
 		{
-			_flags = DomainManagerInitializationFlags.None;
+			_flags = AppDomainManagerInitializationOptions.None;
 		}
 
 		public virtual ApplicationActivator ApplicationActivator {
-			get { return _activator; }
+			get {
+				if (_activator == null)
+					_activator = new ApplicationActivator ();
+				 return _activator;
+			}
 		}
 
 		public virtual Assembly EntryAssembly {
-			get { return _entry; }
+			get { return Assembly.GetEntryAssembly (); }
 		}
 
+		[MonoTODO]
 		public virtual HostExecutionContextManager HostExecutionContextManager {
-			get { return _host_context; }
+			get { throw new NotImplementedException (); }
 		}
 
 		public virtual HostSecurityManager HostSecurityManager {
-			get {
-				if (_host_security == null) {
-					// use default
-					_host_security = new HostSecurityManager ();
-				}
-				return _host_security;
-			}
+			get { return null; }
 		}
 
-		public DomainManagerInitializationFlags InitializationFlags {
+		public AppDomainManagerInitializationOptions InitializationFlags {
 			get { return _flags; }
 			set { _flags = value; }	
 		}
@@ -83,7 +83,7 @@ namespace System {
 			AppDomain ad = CreateDomainHelper (friendlyName, securityInfo, appDomainInfo);
 
 			// supply app domain policy ?
-			if ((HostSecurityManager.Flags & HostSecurityManagerFlags.HostPolicyLevel) == HostSecurityManagerFlags.HostPolicyLevel) {
+			if ((HostSecurityManager.Flags & HostSecurityManagerOptions.HostPolicyLevel) == HostSecurityManagerOptions.HostPolicyLevel) {
 				PolicyLevel pl = HostSecurityManager.DomainPolicy;
 				if (pl != null) {
 					ad.SetAppDomainPolicy (pl);
@@ -98,14 +98,69 @@ namespace System {
 			// default does nothing (as documented)
 		}
 
+		// available in FX2.0 with service pack 1, including the 2.0 shipped as part of FX3.5
+		public virtual bool CheckSecuritySettings (SecurityState state)
+		{
+			return false;
+		}
+
 		// static
 
-		[MonoTODO ("maybe AppDomain.CreateDomain should be calling this ?")]
+		// FIXME: maybe AppDomain.CreateDomain should be calling this?
 		protected static AppDomain CreateDomainHelper (string friendlyName, Evidence securityInfo, AppDomainSetup appDomainInfo)
 		{
 			return AppDomain.CreateDomain (friendlyName, securityInfo, appDomainInfo);
 		}
 	}
-}
+#else
+	[Obsolete ("AppDomainManager is not supported on the current platform.", true)]
+	public class AppDomainManager : MarshalByRefObject {
+		public AppDomainManager ()
+		{
+			throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform.");
+		}
+
+		public virtual ApplicationActivator ApplicationActivator {
+			get { throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform."); }
+		}
+
+		public virtual Assembly EntryAssembly {
+			get { throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform."); }
+		}
+
+		public virtual HostExecutionContextManager HostExecutionContextManager {
+			get { throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform."); }
+		}
+
+		public virtual HostSecurityManager HostSecurityManager {
+			get { throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform."); }
+		}
+
+		public AppDomainManagerInitializationOptions InitializationFlags {
+			get { throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform."); }
+			set { throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform."); }
+		}
 
-#endif
+		public virtual AppDomain CreateDomain (string friendlyName, Evidence securityInfo, AppDomainSetup appDomainInfo)
+		{
+			throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform.");
+		}
+
+		public virtual void InitializeNewDomain (AppDomainSetup appDomainInfo)
+		{
+			throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform.");
+		}
+
+		public virtual bool CheckSecuritySettings (SecurityState state)
+		{
+			throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform.");
+		}
+
+		protected static AppDomain CreateDomainHelper (string friendlyName, Evidence securityInfo, AppDomainSetup appDomainInfo)
+		{
+			throw new PlatformNotSupportedException ("AppDomainManager is not supported on the current platform.");
+		}
+	}
+
+#endif // MONO_FEATURE_MULTIPLE_APPDOMAINS
+}