Merge pull request #1375 from echampet/cleanup

TARGET_J2EE cleanup.

4 files changed, 0 insertions, 60 deletions

diff --git a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
index 905c63c4e7f..6f760a9a6a5 100644
--- a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
@@ -79,10 +79,6 @@ using System.Security.Permissions;
 [assembly: WebResource ("MicrosoftAjaxWebForms.debug.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjaxTimer.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjaxTimer.debug.js", "application/x-javascript")]
-#if TARGET_J2EE
-	[assembly: WebResource ("MicrosoftAjaxExtension.js", "application/x-javascript")]
-	[assembly: WebResource ("MicrosoftAjaxWebFormsExtension.js", "application/x-javascript")]
-#endif
 
 // Those entries must not be enabled until the appropriate .resx files with translations for the client scripts are
 // created.
diff --git a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs
index ecfa05c7937..9c05b6da132 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs
@@ -73,13 +73,6 @@ namespace System.Web.Handlers
 			IHttpHandler currentHandler = context.CurrentHandler;

 			if (currentHandler == null)

 				return;

-#if TARGET_J2EE

-			if (!(currentHandler is Page) && currentHandler is IServiceProvider) {

-				pageType = (Type) ((IServiceProvider) currentHandler).GetService (typeof (Type));

-				if (pageType == null)

-					return;

-			}

-#endif

 			Type pageType = currentHandler.GetType ();

 			if (typeof (Page).IsAssignableFrom (pageType) && !String.IsNullOrEmpty (contentType) && contentType.StartsWith ("application/json", StringComparison.OrdinalIgnoreCase)) {

 				IHttpHandler h = RestHandler.GetHandler (context, pageType, request.FilePath);

@@ -94,10 +87,6 @@ namespace System.Web.Handlers
 			HttpContext context = app.Context;

 			if (context.Request.Headers ["X-MicrosoftAjax"] == "Delta=true") {

 				Page p = context.CurrentHandler as Page;

-#if TARGET_J2EE

-				if (p == null && context.CurrentHandler is IServiceProvider)

-					p = (Page) ((IServiceProvider) context.CurrentHandler).GetService (typeof (Page));

-#endif

 				ScriptManager sm = ScriptManager.GetCurrentInternal (p);

 				if (context.Response.StatusCode == 302) {

 					context.Response.StatusCode = 200;

diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs
index a9b6fc01711..a4b53812bb7 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs
@@ -145,24 +145,7 @@ return this._invoke({0}.get_path(), '{1}',{2},{{{3}}},succeededCallback,failedCa
 			public abstract void Invoke (HttpRequest request, HttpResponse response);
 		}
 
-#if !TARGET_J2EE
 		static Hashtable _type_to_logical_type = Hashtable.Synchronized (new Hashtable ());
-#else
-		const string type_to_logical_type_key = "System.Web.Script.Services.LogicalTypeInfo";
-		static Hashtable _type_to_logical_type {
-			get {
-				Hashtable hash = (Hashtable) AppDomain.CurrentDomain.GetData (type_to_logical_type_key);
-
-				if (hash != null)
-					return hash;
-
-				AppDomain.CurrentDomain.SetData (type_to_logical_type_key, Hashtable.Synchronized (new Hashtable ()));
-
-
-				return (Hashtable) AppDomain.CurrentDomain.GetData (type_to_logical_type_key);
-			}
-		}
-#endif
 
 		static internal LogicalTypeInfo GetLogicalTypeInfo (Type t, string filePath) {
 			Hashtable type_to_manager = _type_to_logical_type;
diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
index e28138d316b..a3778efcb1b 100644
--- a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
@@ -253,12 +253,8 @@ namespace System.Web.UI
 
 		internal bool IsDeploymentRetail {
 			get {
-#if TARGET_J2EE
-				return false;
-#else
 				DeploymentSection deployment = (DeploymentSection) WebConfigurationManager.GetSection ("system.web/deployment");
 				return deployment.Retail;
-#endif
 			}
 		}
 
@@ -303,9 +299,6 @@ namespace System.Web.UI
 		}
 
 		[Category ("Behavior")]
-#if TARGET_J2EE
-		[MonoLimitation ("The 'Auto' value is the same as 'Debug'.")]
-#endif
 		public ScriptMode ScriptMode {
 			get {
 				return _scriptMode;
@@ -706,26 +699,9 @@ namespace System.Web.UI
 			return new ReadOnlyCollection<RegisteredScript> (_startupScriptBlocks);
 		}
 
-#if TARGET_J2EE
-		bool _isMultiForm = false;
-		bool _isMultiFormInited = false;
-
-		bool IsMultiForm {
-			get {
-				if (!_isMultiFormInited) {
-					string isMultiForm = WebConfigurationManager.AppSettings ["mainsoft.use.portlet.namespace"];
-					_isMultiForm = isMultiForm != null ? Boolean.Parse (isMultiForm) : false;
-
-					_isMultiFormInited = true;
-				}
-				return _isMultiForm;
-			}
-		}
-#else
 		bool IsMultiForm {
 			get { return false; }
 		}
-#endif
 
 		bool PanelRequiresUpdate (UpdatePanel panel)
 		{
@@ -904,13 +880,9 @@ namespace System.Web.UI
 				RegisterClientScriptBlock (control, typeof (ScriptManager), url, logicalTypeInfo.Proxy, true);
 			}
 			else {
-#if TARGET_J2EE
-				string pathInfo = "/js.invoke";
-#else
 				string pathInfo = "/js";
 				if (IsDebuggingEnabled)
 					pathInfo += "debug";
-#endif
 				string url = String.Concat (control.ResolveClientUrl (serviceReference.Path), pathInfo);
 				RegisterClientScriptInclude (control, typeof (ScriptManager), url, url);
 			}