TARGET_JVM: update build system

svn path=/trunk/mcs/; revision=58779

mcs/class/System.Data/System.Data.OleDb.jvm/OleDbConnectionFactory.cs

@@ -1,178 +0,0 @@
-//
-// System.Data.OleDb.OleDbConnectionFactory
-//
-// Authors:
-//	Konstantin Triger <[email protected]>
-//	Boris Kirzner <[email protected]>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
-using System.Data;
-using System.Data.Common;
-using System.Data.ProviderBase;
-using System.Reflection;
-using System.Collections;
-
-namespace System.Data.OleDb
-{
-	internal class OleDbConnectionFactory
-	{
-		private static Object LockObj = new Object();
-		private static Hashtable dataSourceCache = new Hashtable();
-		private static Type OracleConnectionCacheImplType = Type.GetType("oracle.jdbc.pool.OracleConnectionCacheImpl");
-																		  
-		private static MethodInfo setUrlMethod = OracleConnectionCacheImplType.GetMethod("setURL", BindingFlags.Public | BindingFlags.Instance);
-		private static MethodInfo setUserMethod = OracleConnectionCacheImplType.GetMethod("setUser", BindingFlags.Public | BindingFlags.Instance);
-		private static MethodInfo setPasswordMethod = OracleConnectionCacheImplType.GetMethod("setPassword", BindingFlags.Public | BindingFlags.Instance);
-		private static MethodInfo getActiveSizeMethod = OracleConnectionCacheImplType.GetMethod("getActiveSize", BindingFlags.Public | BindingFlags.Instance);
-		private static MethodInfo closeMethod = OracleConnectionCacheImplType.GetMethod("close", BindingFlags.Public | BindingFlags.Instance);
-		private static MethodInfo setMaxLimitMethod = OracleConnectionCacheImplType.GetMethod("setMaxLimit", BindingFlags.Public | BindingFlags.Instance);
-		private static MethodInfo setMinLimitMethod = OracleConnectionCacheImplType.GetMethod("setMinLimit", BindingFlags.Public | BindingFlags.Instance);
-		private static long timestamp = DateTime.Now.Ticks;
-		private static int MINUTES_TIMEOUT = 60;
-
-		private static DbStringManager StringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.OleDbStrings");
-
-		internal static java.sql.Connection GetConnection(OleDbConnection.PROVIDER_TYPE providerType,String url,String user,String password,int timeout)
-		{
-			CacheKey key = new CacheKey(url,user,password);
-			Object dataSourceObj;
-			lock(LockObj) 
-			{
-				if (TimeIsOver())
-					Clear();
-
-				dataSourceObj = dataSourceCache[key];
-				if (dataSourceObj == null) 
-				{
-					switch(providerType) 
-					{
-						case OleDbConnection.PROVIDER_TYPE.MSDAORA :					
-					
-							dataSourceObj = Activator.CreateInstance(OracleConnectionCacheImplType);
-					
-							Object[] setUrlArgs = new Object[1] { url };
-							Object[] setUserArgs = new Object[1] { user };
-							Object[] setPasswordArgs = new Object[1] { password };
-
-							setUrlMethod.Invoke(dataSourceObj,setUrlArgs);
-							setUserMethod.Invoke(dataSourceObj,setUserArgs);
-							setPasswordMethod.Invoke(dataSourceObj,setPasswordArgs);
-
-							int maxLimit = Convert.ToInt32(StringManager.GetString("ORA_CONNECTION_POOLING_MAX_LIMIT","-1"));
-							int minLimit = Convert.ToInt32(StringManager.GetString("ORA_CONNECTION_POOLING_MIN_LIMIT","-1"));
-
-							if(minLimit != -1)
-								setMinLimitMethod.Invoke(dataSourceObj,new Object[1] { minLimit } );
-
-							if(maxLimit != -1)
-								setMaxLimitMethod.Invoke(dataSourceObj,new Object[1] { maxLimit } );
-
-							break;
-					}
-					dataSourceCache.Add(key,dataSourceObj);
-				}
-			}
-
-			java.sql.Connection conn;
-			lock(dataSourceObj) {
-				if (((javax.sql.DataSource)dataSourceObj).getLoginTimeout() != timeout) {
-					((javax.sql.DataSource)dataSourceObj).setLoginTimeout(timeout);
-				}
-				conn = ((javax.sql.DataSource)dataSourceObj).getConnection();
-			}
-			return conn;
-		}
-
-		private static bool TimeIsOver() 
-		{
-				return (DateTime.Now.Ticks - timestamp > MINUTES_TIMEOUT * TimeSpan.TicksPerMinute);
-		}
-
-		private static void Clear() 
-		{
-			ArrayList closedDataSources = new ArrayList();
-
-			// collect all the datasources with no connections in use
-			foreach(DictionaryEntry e in dataSourceCache)
-			{
-				Object dataSourceObj = e.Value;
-				Object dataSourceObjKey = e.Key;
-
-				if (getActiveSizeMethod.Invoke(dataSourceObj,new object[0]).Equals(0)) {
-					closeMethod.Invoke(dataSourceObj,new object[0]);
-					closedDataSources.Add(dataSourceObjKey);
-				}
-			}
-
-			// close and remove all data sources with no connections in use
-			foreach(Object dataSourceObjKey in closedDataSources) {
-				dataSourceCache.Remove(dataSourceObjKey);
-			}	
-		}
-	}
-
-	// Key for data sources cache
-	// data sources mapped by jdbc url, user and password
-	internal class CacheKey
-    {
-        private String url;
-        private String user;
-        private String password;
-
-        public CacheKey(String url, String user, String password)
-        {
-            this.url = url;
-            this.user = user;
-            this.password = password;
-        }
-
-        public bool equals(Object o)
-        {
-            if (this == o) return true;
-            if (!(o is CacheKey)) return false;
-
-            CacheKey cacheKey = (CacheKey) o;
-
-            if (!password.Equals(cacheKey.password)) return false;
-            if (!url.Equals(cacheKey.url)) return false;
-            if (!user.Equals(cacheKey.user)) return false;
-
-            return true;
-        }
-
-        public int hashCode()
-        {
-            int result;
-            result = url.GetHashCode();
-            result = 29 * result + user.GetHashCode();
-            result = 29 * result + password.GetHashCode();
-            return result;
-        }
-    }
-}

mcs/class/System.Data/System.Data.ProviderBase.jvm/DbPortResolver.cs

@@ -1,130 +0,0 @@
-//
-// System.Data.ProviderBase.PDbPortResolver
-//
-// Authors:
-//	Konstantin Triger <[email protected]>
-//	Boris Kirzner <[email protected]>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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;
-
-using java.net;
-
-namespace System.Data.ProviderBase
-{
-	internal sealed  class DbPortResolver
-	{
-		public static int getMSSqlPort(AbstractDBConnection connection)
-		{
-			String instanceName = connection.InstanceName;
-			int timeout = connection.ConnectionTimeout;
-			int port = -1;
-			try
-			{
-				DatagramSocket socket = new DatagramSocket();
-
-				// send request
-				sbyte[] buf = new sbyte[] {2};
-				InetAddress address = InetAddress.getByName(connection.DataSource);
-				DatagramPacket packet = new DatagramPacket(buf, buf.Length, address, 1434);
-				socket.send(packet);
-				sbyte[] recbuf = new sbyte[1024];
-				packet = new DatagramPacket(recbuf, recbuf.Length, packet.getAddress(), packet.getPort());
-
-				// try to receive from socket while increasing timeouts in geometric progression
-				int iterationTimeout = 1;
-				int totalTimeout = 0;
-				for(;;) {
-					socket.setSoTimeout(iterationTimeout);
-					try
-					{
-						socket.receive(packet);
-						break;
-					}
-					catch (SocketTimeoutException e)
-					{
-						totalTimeout += iterationTimeout;
-						iterationTimeout *= 2;
-						if (totalTimeout >= timeout*1000) {
-							throw new java.sql.SQLException(
-								String.Format ("Unable to retrieve the port number for {0} using UDP on port 1434. Please see your network administrator to solve this problem or add the port number of your SQL server instance to your connection string (i.e. port=1433).", connection.DataSource)
-								);
-						}
-					}
-				}
-				sbyte[] rcvdSbytes = packet.getData();
-				char[] rcvdChars = new char[rcvdSbytes.Length];
-				for(int i=0; i < rcvdSbytes.Length; i++)
-				{
-					rcvdChars[i] = (char)rcvdSbytes[i];
-				}
-				String received = new String(rcvdChars);
-
-				java.util.StringTokenizer st = new java.util.StringTokenizer(received, ";");
-				String prev = "";
-				bool instanceReached = instanceName == null || instanceName.Length == 0;
-				while (st.hasMoreTokens())
-				{
-					if (!instanceReached)
-					{
-						if (prev.Trim().Equals("InstanceName"))
-						{
-							if (String.Compare(instanceName,st.nextToken().Trim(),true) == 0)
-							{
-								instanceReached = true;
-							}
-						}
-					}
-					else
-					{
-						if (prev.Trim().Equals("tcp"))
-						{
-							port = java.lang.Integer.parseInt(st.nextToken().Trim());
-							break;
-						}
-					}
-					prev = st.nextToken();
-				}
-				socket.close();
-
-				if (!instanceReached)
-					throw new java.sql.SQLException(
-						String.Format ("Specified SQL Server '{0}\\{1}' not found.", connection.DataSource, instanceName)
-						);
-				return port;
-
-			}
-			catch (java.sql.SQLException) {
-				throw;
-			}
-			catch (Exception e) {
-				throw new java.sql.SQLException(e.Message);
-			}
-		}
-	    
-	}
-}

mcs/class/System.Data/System.Data.ProviderBase.jvm/DbStringManager.cs

@@ -1,89 +0,0 @@
-//
-// System.Data.ProviderBase.DbStringManager
-//
-// Authors:
-//	Konstantin Triger <[email protected]>
-//	Boris Kirzner <[email protected]>
-//	
-// (C) 2005 Mainsoft Corporation (http://www.mainsoft.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.Resources;
-using System.Reflection;
-
-namespace System.Data.ProviderBase
-{
-	public class DbStringManager
-	{
-		#region Fields
-
-		private readonly string _resourceName;
-        private readonly ResourceManager _resourceManager;
-		private readonly char[] _delimiters;
-
-		#endregion // Fields
-
-		#region Constructors
-
-		public DbStringManager(string resourceName)
-		{
-			_resourceName = resourceName;
-			_resourceManager = new ResourceManager(resourceName,Assembly.GetExecutingAssembly());
-			_delimiters = new char[] {','};
-		}        
-
-		#endregion // Constructors
-
-		#region Methods
-
-        public string GetString(string key)
-        {
-			return _resourceManager.GetString(key);
-        }
-	
-        public string GetString(string key, string defaultValue)
-        {
-            try {
-                return GetString(key);
-            }
-            catch (Exception) {
-                return defaultValue;
-            }
-        }
-	
-        public string[] GetStringArray(String key)
-        {
-            string tmp  = _resourceManager.GetString(key);
-            string[] values = tmp.Split(_delimiters);
-			
-			for(int i=0; i < values.Length; i++) {
-				values[i] = values[i].Trim();
-			}
-            return values;			
-        }
-
-		#endregion // Methods
-    }
-}

mcs/class/System.Data/System.Data.ProviderBase.jvm/OleDbStrings.resx

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
-	<!-- 
-    Microsoft ResX Schema 
-    
-    Version 1.3
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        [base64 mime encoded serialized .NET Framework object]
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used forserialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>1.3</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<data name="CON_PROVIDER">
-		<value>provider</value>
-	</data>
-	<data name="CON_DATA_SOURCE">
-		<value>data source,server,address,addr,network address,host</value>
-	</data>
-	<data name="CON_DATABASE">
-		<value>database,initial catalog</value>
-	</data>
-	<data name="CON_PASSWORD">
-		<value>password,pwd</value>
-	</data>
-	<data name="CON_USER_ID">
-		<value>user id,user,uid</value>
-	</data>
-	<data name="CON_TIMEOUT">
-		<value>connect timeout,connection timeout</value>
-	</data>
-	<data name="CON_SERVER_NAME">
-		<value>hostname</value>
-	</data>
-	<data name="CON_PORT">
-		<value>port</value>
-	</data>
-	<data name="CON_SERVICE_NAME">
-		<value>servicename</value>
-	</data>
-	<data name="CON_JNDI_NAME">
-		<value>jndi-datasource-name</value>
-	</data>
-	<data name="CON_JNDI_PROVIDER">
-		<value>naming-provider-url</value>
-	</data>
-	<data name="CON_JNDI_FACTORY">
-		<value>naming-factory-initial</value>
-	</data>
-	<data name="JDBC_DRIVER">
-		<value>JdbcDriverClassName</value>
-	</data>
-	<data name="JDBC_URL">
-		<value>JdbcURL</value>
-	</data>
-	<data name="DATA_SOURCE">
-		<value>zork</value>
-	</data>
-	<data name="SERVICE_NAME">
-		<value>ora817 </value>
-	</data>
-	<data name="SQL_JDBC_DRIVER">
-		<value>com.microsoft.jdbc.sqlserver.SQLServerDriver</value>
-	</data>
-	<data name="SQL_JDBC_URL">
-		<value>jdbc:microsoft:sqlserver://</value>
-	</data>
-	<data name="SQL_CON_PORT">
-		<value>1433</value>
-	</data>
-	<data name="SQL_DEFAULT_INSTANCE_NAME">
-		<value>MSSQLSERVER</value>
-	</data>
-	<data name="ORA_JDBC_DRIVER">
-		<value>oracle.jdbc.OracleDriver</value>
-	</data>
-	<data name="ORA_JDBC_URL">
-		<value>jdbc:oracle:thin:@</value>
-	</data>
-	<data name="ORA_CON_PORT">
-		<value>1521</value>
-	</data>
-	<data name="ORA_CONNECTION_POOLING_ENABLED">
-		<value>true</value>
-	</data>
-	<data name="ORA_CONNECTION_POOLING_MIN_LIMIT">
-		<value>0</value>
-	</data>
-	<data name="ORA_CONNECTION_POOLING_MAX_LIMIT">
-		<value>50</value>
-	</data>
-	<data name="DB2_JDBC_DRIVER">
-		<value>com.ibm.db2.jcc.DB2Driver</value>
-	</data>
-	<data name="DB2_JDBC_URL">
-		<value>jdbc:db2://</value>
-	</data>
-	<data name="DB2_CON_PORT">
-		<value>50000</value>
-	</data>
-	<data name="DB2_CON_LOCATION">
-		<value>Location</value>
-	</data>
-</root>

mcs/class/System.Data/System.Data.ProviderBase.jvm/SqlClientStrings.resx

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
-	<!-- 
-    Microsoft ResX Schema 
-    
-    Version 1.3
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        [base64 mime encoded serialized .NET Framework object]
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used forserialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>1.3</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<data name="CON_DATA_SOURCE">
-		<value>data source,server,address,addr,network address</value>
-	</data>
-	<data name="CON_DATABASE">
-		<value>database,initial catalog</value>
-	</data>
-	<data name="CON_WORKSTATION_ID">
-		<value>workstation id</value>
-	</data>
-	<data name="CON_PACKET_SIZE">
-		<value>packet size</value>
-	</data>
-	<data name="CON_PASSWORD">
-		<value>password,pwd</value>
-	</data>
-	<data name="CON_USER_ID">
-		<value>user id,user,uid</value>
-	</data>
-	<data name="CON_PORT">
-		<value>port</value>
-	</data>
-	<data name="SQL_CON_PORT">
-		<value>1433</value>
-	</data>
-	<data name="CON_TIMEOUT">
-		<value>connect timeout,connection timeout</value>
-	</data>
-	<data name="JDBC_DRIVER">
-		<value>com.microsoft.jdbc.sqlserver.SQLServerDriver</value>
-	</data>
-	<data name="SQL_JDBC_URL">
-		<value>jdbc:microsoft:sqlserver://</value>
-	</data>
-	<data name="DEFAULT_INSTANCE_NAME">
-		<value>MSSQLSERVER</value>
-	</data>
-	<data name="CON_JNDI_NAME">
-		<value>jndi-datasource-name</value>
-	</data>
-	<data name="CON_JNDI_PROVIDER">
-		<value>naming-provider-url</value>
-	</data>
-	<data name="CON_JNDI_FACTORY">
-		<value>naming-factory-initial</value>
-	</data>
-</root>

mcs/class/System.Data/System.Data.vmwcsproj

@@ -136,7 +136,6 @@
 				<File RelPath="System.Data\ReadOnlyException.cs" SubType="Code" BuildAction="Compile"/>
 				<File RelPath="System.Data\RelatedDataView.cs" SubType="Component" BuildAction="Compile"/>
 				<File RelPath="System.Data\RelationshipConverter.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data\Res.cs" SubType="Code" BuildAction="Compile"/>
 				<File RelPath="System.Data\ResDescriptionAttribute.cs" SubType="Code" BuildAction="Compile"/>
 				<File RelPath="System.Data\ResultSetOptions.cs" SubType="Code" BuildAction="Compile"/>
 				<File RelPath="System.Data\ResultSetSensitivity.cs" SubType="Code" BuildAction="Compile"/>

mcs/class/System.Data/net_1_1_java_System.Data.dll.exclude.sources

@@ -1,10 +1,6 @@
-System.Data.Common/ConnectionStringsSectionHandler.cs
-System.Data.Common/DbConnectionOptions.cs
-System.Data.Common/DbConnectionStringBuilder.cs
-System.Data.Common/DbConnectionStringBuilderHelper.cs
-System.Data.Common/DbException.cs
-System.Data.Common/DbProviderSpecificTypePropertyAttribute.cs
-System.Data.Odbc/*.cs
+System.Data.Odbc/libodbc.cs
+System.Data.Odbc/NativeBuffer.cs
+System.Data.Odbc/OdbcCategoryAttribute.cs
 System.Data.Odbc/OdbcColumn.cs
 System.Data.Odbc/OdbcCommand.cs
 System.Data.Odbc/OdbcCommandBuilder.cs
@@ -30,9 +26,9 @@ System.Data.Odbc/OdbcRowUpdatingEventArgs.cs
 System.Data.Odbc/OdbcRowUpdatingEventHandler.cs
 System.Data.Odbc/OdbcTransaction.cs
 System.Data.Odbc/OdbcType.cs
-System.Data.Odbc/OdbcTypeMap.cs
 System.Data.Odbc/OdbcTypeConverter.cs
-System.Data.Odbc/libodbc.cs
+System.Data.Odbc/OdbcTypeMap.cs
+System.Data.OleDb/libgda.cs
 System.Data.OleDb/OleDbCommand.cs
 System.Data.OleDb/OleDbCommandBuilder.cs
 System.Data.OleDb/OleDbConnection.cs
@@ -56,44 +52,10 @@ System.Data.OleDb/OleDbRowUpdatingEventHandler.cs
 System.Data.OleDb/OleDbSchemaGuid.cs
 System.Data.OleDb/OleDbTransaction.cs
 System.Data.OleDb/OleDbType.cs
-System.Data.OleDb/libgda.cs
-System.Data.Sql/DataAccessKind.cs
-System.Data.Sql/Format.cs
-System.Data.Sql/IBinarySerialize.cs
-System.Data.Sql/ISqlCommand.cs
-System.Data.Sql/ISqlConnection.cs
-System.Data.Sql/ISqlExecutionContext.cs
-System.Data.Sql/ISqlGetTypedData.cs
-System.Data.Sql/ISqlParameter.cs
-System.Data.Sql/ISqlParameterCollection.cs
-System.Data.Sql/ISqlReader.cs
-System.Data.Sql/ISqlRecord.cs
-System.Data.Sql/ISqlResultSet.cs
-System.Data.Sql/ISqlSetTypedData.cs
-System.Data.Sql/ISqlTransaction.cs
-System.Data.Sql/ISqlUpdatableRecord.cs
-System.Data.Sql/IUdtSerializationContext.cs
-System.Data.Sql/InvalidUdtException.cs
-System.Data.Sql/SerializationHelper.cs
-System.Data.Sql/SerializationVersion.cs
-System.Data.Sql/SqlContextBase.cs
 System.Data.Sql/SqlDataSourceEnumerator.cs
-System.Data.Sql/SqlDefinition.cs
-System.Data.Sql/SqlFacetAttribute.cs
-System.Data.Sql/SqlFunctionAttribute.cs
-System.Data.Sql/SqlMetaData.cs
-System.Data.Sql/SqlMethodAttribute.cs
 System.Data.Sql/SqlNotificationRequest.cs
-System.Data.Sql/SqlPipeBase.cs
-System.Data.Sql/SqlServerFactoryBase.cs
-System.Data.Sql/SqlTriggerContextBase.cs
-System.Data.Sql/SqlUserDefinedAggregateAttribute.cs
-System.Data.Sql/SqlUserDefinedTypeAttribute.cs
-System.Data.Sql/SystemDataAccessKind.cs
-System.Data.Sql/TriggerAction.cs
 System.Data.SqlClient/ISqlNotificationReceiver.cs
 System.Data.SqlClient/OnChangeEventHandler.cs
-System.Data.SqlClient/SQLDebugging.cs
 System.Data.SqlClient/SqlAsyncResult.cs
 System.Data.SqlClient/SqlAsyncState.cs
 System.Data.SqlClient/SqlBulkCopyColumnMapping.cs
@@ -110,6 +72,7 @@ System.Data.SqlClient/SqlConnectionStringBuilder.cs
 System.Data.SqlClient/SqlDataAdapter.cs
 System.Data.SqlClient/SqlDataReader.cs
 System.Data.SqlClient/SqlDataSourceEnumerator.cs
+System.Data.SqlClient/SQLDebugging.cs
 System.Data.SqlClient/SqlError.cs
 System.Data.SqlClient/SqlErrorCollection.cs
 System.Data.SqlClient/SqlException.cs
@@ -124,13 +87,12 @@ System.Data.SqlClient/SqlNotificationType.cs
 System.Data.SqlClient/SqlParameter.cs
 System.Data.SqlClient/SqlParameterCollection.cs
 System.Data.SqlClient/SqlParameterConverter.cs
-System.Data.SqlClient/SqlResultSet.cs
+System.Data.SqlClient/SqlRowsCopiedEventArgs.cs
+System.Data.SqlClient/SqlRowsCopiedEventHandler.cs
 System.Data.SqlClient/SqlRowUpdatedEventArgs.cs
 System.Data.SqlClient/SqlRowUpdatedEventHandler.cs
 System.Data.SqlClient/SqlRowUpdatingEventArgs.cs
 System.Data.SqlClient/SqlRowUpdatingEventHandler.cs
-System.Data.SqlClient/SqlRowsCopiedEventArgs.cs
-System.Data.SqlClient/SqlRowsCopiedEventHandler.cs
 System.Data.SqlClient/SqlTransaction.cs
 System.Data.SqlClient/SqlXmlTextReader.cs
 System.Data.SqlTypes/INullable.cs
@@ -159,9 +121,8 @@ System.Data.SqlTypes/SqlTime.cs
 System.Data.SqlTypes/SqlTruncateException.cs
 System.Data.SqlTypes/SqlTypeException.cs
 System.Data.SqlTypes/SqlUtcDateTime.cs
+System.Data.SqlTypes/SqlXml.cs
 System.Data.SqlTypes/SqlXmlReader.cs
 System.Data.SqlTypes/StorageState.cs
-System.Data/DataTableClearEventArgs.cs
-System.Data/DataTableClearEventHandler.cs
 System.Data/CustomDataClassGenerator.cs
 System.Data/TypedDataSetGenerator.cs

mcs/class/System.Data/net_1_1_java_System.Data.dll.sources

@@ -1,9 +1,104 @@
 #include System.Data.dll.sources
-System.Data.Common/DbConvert.cs
+Mainsoft.Data.Configuration.jvm/IKeyMapper.cs
+Mainsoft.Data.Configuration.jvm/KeyMapperBase.cs
+Mainsoft.Data.Configuration.jvm/ProvidersSectionHandler.cs
+Mainsoft.Data.Jdbc.Providers.jvm/GenericProvider.cs
+Mainsoft.Data.Jdbc.Providers.jvm/IProvider.cs
+Mainsoft.Data.Jdbc.Providers.jvm/OleDbDB2Provider.cs
+Mainsoft.Data.Jdbc.Providers.jvm/OleDbOracleProvider.cs
+Mainsoft.Data.Jdbc.Providers.jvm/OleDbSqlServerProvider.cs
+Mainsoft.Data.Jdbc.Providers.jvm/wrappers.cs
 System.Data.Common/DbMetaDataCache.cs
-System.Data.Configuration.jvm/*.cs
-System.Data.OleDb.jvm/*.cs
-System.Data.ProviderBase.jvm/*.cs
-System.Data.SqlClient.jvm/*.cs
-System.Data.SqlTypes.jvm/*.cs
-System.Data/Res.cs
+System.Data.Configuration.jvm/GlobalConfig.cs
+System.Data.Configuration.jvm/ObjectNameResolutionSectionHandler.cs
+System.Data.Configuration.jvm/ObjectNameResolver.cs
+System.Data.Configuration.jvm/ObjectNameResolversCollection.cs
+System.Data.OleDb.jvm/OleDbCommand.cs
+System.Data.OleDb.jvm/OleDbCommandBuilder.cs
+System.Data.OleDb.jvm/OleDbConnection.cs
+System.Data.OleDb.jvm/OleDbConvert.cs
+System.Data.OleDb.jvm/OleDbDataAdapter.cs
+System.Data.OleDb.jvm/OleDbDataReader.cs
+System.Data.OleDb.jvm/OleDbError.cs
+System.Data.OleDb.jvm/OleDbErrorCollection.cs
+System.Data.OleDb.jvm/OleDbException.cs
+System.Data.OleDb.jvm/OleDbInfoMessageEventArgs.cs
+System.Data.OleDb.jvm/OleDbInfoMessageEventHandler.cs
+System.Data.OleDb.jvm/OleDbLiteral.cs
+System.Data.OleDb.jvm/OleDbParameter.cs
+System.Data.OleDb.jvm/OleDbParameterCollection.cs
+System.Data.OleDb.jvm/OleDbPermission.cs
+System.Data.OleDb.jvm/OleDbPermissionAttribute.cs
+System.Data.OleDb.jvm/OleDbRowUpdatedEventArgs.cs
+System.Data.OleDb.jvm/OleDbRowUpdatedEventHandler.cs
+System.Data.OleDb.jvm/OleDbRowUpdatingEventArgs.cs
+System.Data.OleDb.jvm/OleDbRowUpdatingEventHandler.cs
+System.Data.OleDb.jvm/OleDbSchemaGuid.cs
+System.Data.OleDb.jvm/OleDbTransaction.cs
+System.Data.OleDb.jvm/OleDbType.cs
+System.Data.ProviderBase.jvm/AbstractDataReader.cs
+System.Data.ProviderBase.jvm/AbstractDBCommand.cs
+System.Data.ProviderBase.jvm/AbstractDbCommandBuilder.cs
+System.Data.ProviderBase.jvm/AbstractDBConnection.cs
+System.Data.ProviderBase.jvm/AbstractDbError.cs
+System.Data.ProviderBase.jvm/AbstractDbErrorCollection.cs
+System.Data.ProviderBase.jvm/AbstractDbException.cs
+System.Data.ProviderBase.jvm/AbstractDBParameter.cs
+System.Data.ProviderBase.jvm/AbstractDbParameterCollection.cs
+System.Data.ProviderBase.jvm/AbstractTransaction.cs
+System.Data.ProviderBase.jvm/DbConvert.cs
+System.Data.ProviderBase.jvm/ParameterMetadataWrapper.cs
+System.Data.ProviderBase.jvm/ReaderCache.cs
+System.Data.ProviderBase.jvm/regex.cs
+System.Data.SqlClient.jvm/ISqlNotificationReceiver.cs
+System.Data.SqlClient.jvm/MetaType.cs
+System.Data.SqlClient.jvm/SqlClientPermission.cs
+System.Data.SqlClient.jvm/SqlClientPermissionAttribute.cs
+System.Data.SqlClient.jvm/SqlCollation.cs
+System.Data.SqlClient.jvm/SqlCommand.cs
+System.Data.SqlClient.jvm/SqlCommandBuilder.cs
+System.Data.SqlClient.jvm/SqlConnection.cs
+System.Data.SqlClient.jvm/SqlConnectionPool.cs
+System.Data.SqlClient.jvm/SqlConvert.cs
+System.Data.SqlClient.jvm/SqlDataAdapter.cs
+System.Data.SqlClient.jvm/SqlDataReader.cs
+System.Data.SqlClient.jvm/SqlError.cs
+System.Data.SqlClient.jvm/SqlErrorCollection.cs
+System.Data.SqlClient.jvm/SqlException.cs
+System.Data.SqlClient.jvm/SqlInfoMessageEventArgs.cs
+System.Data.SqlClient.jvm/SqlInfoMessageEventHandler.cs
+System.Data.SqlClient.jvm/SqlParameter.cs
+System.Data.SqlClient.jvm/SqlParameterCollection.cs
+System.Data.SqlClient.jvm/SqlParameterConverter.cs
+System.Data.SqlClient.jvm/SqlResultSet.cs
+System.Data.SqlClient.jvm/SqlRowUpdatedEventArgs.cs
+System.Data.SqlClient.jvm/SqlRowUpdatedEventHandler.cs
+System.Data.SqlClient.jvm/SqlRowUpdatingEventArgs.cs
+System.Data.SqlClient.jvm/SqlRowUpdatingEventHandler.cs
+System.Data.SqlClient.jvm/SqlTransaction.cs
+System.Data.SqlClient.jvm/SqlXmlTextReader.cs
+System.Data.SqlTypes.jvm/INullable.cs
+System.Data.SqlTypes.jvm/SqlBinary.cs
+System.Data.SqlTypes.jvm/SqlBoolean.cs
+System.Data.SqlTypes.jvm/SqlByte.cs
+System.Data.SqlTypes.jvm/SqlBytes.cs
+System.Data.SqlTypes.jvm/SqlChars.cs
+System.Data.SqlTypes.jvm/SqlCompareOptions.cs
+System.Data.SqlTypes.jvm/SqlDate.cs
+System.Data.SqlTypes.jvm/SqlDateTime.cs
+System.Data.SqlTypes.jvm/SqlDecimal.cs
+System.Data.SqlTypes.jvm/SqlDouble.cs
+System.Data.SqlTypes.jvm/SqlGuid.cs
+System.Data.SqlTypes.jvm/SqlInt16.cs
+System.Data.SqlTypes.jvm/SqlInt32.cs
+System.Data.SqlTypes.jvm/SqlInt64.cs
+System.Data.SqlTypes.jvm/SqlMoney.cs
+System.Data.SqlTypes.jvm/SqlNullValueException.cs
+System.Data.SqlTypes.jvm/SqlSingle.cs
+System.Data.SqlTypes.jvm/SqlStreamChars.cs
+System.Data.SqlTypes.jvm/SqlString.cs
+System.Data.SqlTypes.jvm/SqlTime.cs
+System.Data.SqlTypes.jvm/SqlTruncateException.cs
+System.Data.SqlTypes.jvm/SqlTypeException.cs
+System.Data.SqlTypes.jvm/SqlUtcDateTime.cs
+System.Data.SqlTypes.jvm/SqlXmlReader.cs