[Cleanup] Removed TARGET_JVM

It was once part of a special Java target profile, but this is no longer used today.

7 files changed, 0 insertions, 82 deletions

diff --git a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
index bd93a4debbb..fd9d08db646 100644
--- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
@@ -56,10 +56,8 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 
-#if !TARGET_JVM
 	[assembly: AssemblyDelaySign (true)]
 	[assembly: AssemblyKeyFile("../ecma.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: CLSCompliant (false)]
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs
index 0e7efffeed4..f5a8ce25922 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpConnectionPool.cs
@@ -65,10 +65,8 @@ namespace System.Runtime.Remoting.Channels.Tcp
 

 		public static void Shutdown ()

 		{

-#if !TARGET_JVM

 			if (_poolThread != null)

 				_poolThread.Abort();

-#endif

 		}

 

 		public static int MaxOpenConnections

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
index 9ca8bba321d..cab5d342086 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
@@ -56,9 +56,6 @@ namespace System.Runtime.Remoting.Channels.Tcp
 		
 		RemotingThreadPool threadPool;
 		
-#if TARGET_JVM
-		private volatile bool stopped = false;
-#endif
 
 		void Init (IServerChannelSinkProvider serverSinkProvider)
 		{
@@ -207,11 +204,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
 		{
 			try
 			{
-#if !TARGET_JVM
 				while(true)
-#else
-				while(!stopped)
-#endif
 				{
 					Socket socket = listener.AcceptSocket ();
 					ClientConnection reader = new ClientConnection (this, socket, sink);
@@ -236,9 +229,6 @@ namespace System.Runtime.Remoting.Channels.Tcp
 
 		public void StartListening (object data)
 		{
-#if TARGET_JVM
-			stopped = false;
-#endif 
 			listener = new TcpListener (bindAddress, port);
 			if (server_thread == null) 
 			{
@@ -261,16 +251,9 @@ namespace System.Runtime.Remoting.Channels.Tcp
 
 		public void StopListening (object data)
 		{
-#if TARGET_JVM
-			stopped = true;
-#endif 
 			if (server_thread == null) return;
 			
-#if !TARGET_JVM
 			server_thread.Abort ();
-#else
-			server_thread.Interrupt ();
-#endif
 			listener.Stop ();
 			threadPool.Free ();
 			server_thread.Join ();
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
index 7da3a54c3ce..400fabd8fac 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
@@ -98,13 +98,8 @@ namespace System.Runtime.Remoting.Channels
 			RemotingSurrogateSelector surrogateSelector = new RemotingSurrogateSelector ();
 			StreamingContext context = new StreamingContext (StreamingContextStates.Remoting, null);
 
-#if !TARGET_JVM
 			_serializationFormatter = new BinaryFormatter (surrogateSelector, context);
 			_deserializationFormatter = new BinaryFormatter (null, context);
-#else
-			_serializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (surrogateSelector, context, false);
-			_deserializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (null, context, false);
-#endif
 			
 			_serializationFormatter.FilterLevel = _filterLevel;
 			_deserializationFormatter.FilterLevel = _filterLevel;
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/RemotingThreadPool.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/RemotingThreadPool.cs
index aa99a655487..123cbaf860e 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/RemotingThreadPool.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/RemotingThreadPool.cs
@@ -46,9 +46,6 @@ namespace System.Runtime.Remoting.Channels
 		AutoResetEvent threadDone = new AutoResetEvent (false);
 		ArrayList runningThreads = new ArrayList ();
 		 
-#if TARGET_JVM
-		volatile 
-#endif
 		bool stopped = false;
 		
 		static object globalLock = new object ();
@@ -75,11 +72,7 @@ namespace System.Runtime.Remoting.Channels
 					threadDone.Set ();
 					workItems.Clear ();
 					foreach (Thread t in runningThreads)
-#if !TARGET_JVM
 						t.Abort ();
-#else
-						t.Interrupt();
-#endif
 					runningThreads.Clear ();
 				}
 				if (this == sharedPool)
@@ -138,12 +131,7 @@ namespace System.Runtime.Remoting.Channels
 		
 		void PoolThread ()
 		{
-#if !TARGET_JVM
 			while (true) {
-#else
-			while (!stopped) 
-			{
-#endif
 				ThreadStart work = null;
 				do {
 					lock (workItems) {
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
index 85c71a1c026..055824f9505 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
@@ -74,34 +74,6 @@ namespace System.Runtime.Remoting.Channels {
 			if (sf != null) {

 				if(_serverFaultExceptionField != null)

 					e = (Exception) _serverFaultExceptionField.GetValue(sf);

-#if TARGET_JVM				

-				if (e == null && sf.ExceptionType != null)

-				{

-					try

-					{

-						Type te = Type.GetType(sf.ExceptionType);

-						if (te != null)

-						{

-							ConstructorInfo ce = te.GetConstructor(

-								BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.CreateInstance,

-								null, new Type[] {typeof(string)}, null);

-

-							if (ce != null)

-							{

-								e = (Exception) ce.Invoke(new object[] {sf.ExceptionMessage});

-							}

-							else

-							{

-								e = (Exception) Activator.CreateInstance(te);

-							}

-						}

-					}

-					catch

-					{

-						e = null;

-					}

-				}

-#endif

 			}

 			if (e == null)

 				e = new RemotingException (fault.FaultString);

@@ -431,12 +403,6 @@ namespace System.Runtime.Remoting.Channels {
 		

 		object GetNullValue (Type paramType)

 		{

-#if TARGET_JVM			

-			if (paramType.IsEnum)

-			{

-				return Activator.CreateInstance(paramType);

-			}

-#endif

 			switch (Type.GetTypeCode (paramType))

 			{

 				case TypeCode.Boolean: return false;

@@ -453,12 +419,6 @@ namespace System.Runtime.Remoting.Channels {
 				case TypeCode.UInt32: return (uint)0;

 				case TypeCode.UInt64: return (ulong)0;

 				default: 

-#if TARGET_JVM			

-					if (paramType.IsValueType)

-					{

-						return Activator.CreateInstance(paramType);

-					}

-#endif					

 					return null;

 			}

 		}

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs
index f8dcf058f67..703b97fd828 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs
@@ -35,10 +35,8 @@ using System.Text;
 using System.Xml;
 using System.Reflection;
 using System.Net;
-#if !TARGET_JVM
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
-#endif
 
 namespace System.Runtime.Remoting.MetadataServices
 {
@@ -56,7 +54,6 @@ namespace System.Runtime.Remoting.MetadataServices
 		{
 		}
 
-#if !TARGET_JVM
 		[MonoTODO ("strong name")]
 		public static void ConvertCodeSourceFileToAssemblyFile (
 				   string codePath,
@@ -133,7 +130,6 @@ namespace System.Runtime.Remoting.MetadataServices
 			memStream.Position = 0;
 			cg.GenerateCode (clientProxy, outputDirectory, memStream, outCodeStreamList, proxyUrl, proxyNamespace);
 		}
-#endif
 
 		public static void ConvertTypesToSchemaToFile (ServiceType [] types, SdlType sdlType, string path)
 		{