Quellcode durchsuchen

Set svn:eol-style to native.
Added padding with 0's to buffers fed back to OCI.

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

Leszek 'skolima' Ciesielski vor 19 Jahren
Ursprung
Commit
d63b262fed
19 geänderte Dateien mit 1099 neuen und 1081 gelöschten Zeilen
  1. 5 0
      mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/Changelog
  2. 45 36
      mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciCalls.cs
  3. 33 33
      mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDefineHandle.cs
  4. 31 31
      mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciErrorHandle.cs
  5. 14 14
      mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciRowIdDescriptor.cs
  6. 38 38
      mcs/class/System.Data.OracleClient/System.Data.OracleClient.sln
  7. 47 47
      mcs/class/System.Data.OracleClient/System.Data.OracleClient.vmwcsproj
  8. 4 0
      mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog
  9. 36 36
      mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs
  10. 36 36
      mcs/class/System.Data.OracleClient/System.Data.OracleClient20.sln
  11. 163 163
      mcs/class/System.Data.OracleClient/System.Data.OracleClient20.vmwcsproj
  12. 12 12
      mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.J2EE.config
  13. 33 33
      mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.sln
  14. 137 137
      mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.vmwcsproj
  15. 26 26
      mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.sln
  16. 229 229
      mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.vmwcsproj
  17. 2 2
      mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/ChangeLog
  18. 20 20
      mcs/class/System.Data.OracleClient/run-tests.bat
  19. 188 188
      mcs/class/System.Data.OracleClient/run-tests.test.bat

+ 5 - 0
mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/Changelog

@@ -0,0 +1,5 @@
+2007-01-04 Leszek Ciesielski <[email protected]>
+        * OciCalls.cs:
+	* OciErrorHandle.cs:
+	* OciRowIdDescriptor.cs:
+	* OciDefineHandle.cs: padding allocated memory with 0's (this is what OCI expects)

+ 45 - 36
mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciCalls.cs

@@ -1,5 +1,5 @@
 //
-// OciCalls.cs 
+// OciCalls.cs
 //
 // Part of the Mono class libraries at
 // mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci
@@ -350,10 +350,10 @@ namespace System.Data.OracleClient.Oci
 				byte csfrm);
 
 			[DllImport ("oci")]
-			internal static extern int OCINlsGetInfo (IntPtr hndl, 
+			internal static extern int OCINlsGetInfo (IntPtr hndl,
 				IntPtr errhp,
 				[In][Out] byte[] bufp,
-				uint buflen, 
+				uint buflen,
 				ushort item);
 
 			[DllImport ("oci")]
@@ -411,7 +411,7 @@ namespace System.Data.OracleClient.Oci
 				uint nrows,
 				ushort orientation,
 				uint mode);
-							
+
 
 			[DllImport ("oci")]
 			internal static extern int OCIStmtPrepare (IntPtr stmthp,
@@ -440,18 +440,18 @@ namespace System.Data.OracleClient.Oci
 			[DllImport ("oci")]
 			internal static extern int OCICharSetToUnicode (
 				IntPtr svchp,
-				[MarshalAs (UnmanagedType.LPWStr)] StringBuilder dst, 
-				[MarshalAs (UnmanagedType.U4)] int dstlen, 
+				[MarshalAs (UnmanagedType.LPWStr)] StringBuilder dst,
+				[MarshalAs (UnmanagedType.U4)] int dstlen,
 				byte [] src,
 				[MarshalAs (UnmanagedType.U4)] int srclen,
 				[MarshalAs (UnmanagedType.U4)] out int rsize);
-			
+
 			[DllImport ("oci")]
 			internal static extern int OCIUnicodeToCharSet (
 				IntPtr svchp,
 				byte [] dst,
-				[MarshalAs (UnmanagedType.U4)] int dstlen, 
-				[MarshalAs (UnmanagedType.LPWStr)] string src, 
+				[MarshalAs (UnmanagedType.U4)] int dstlen,
+				[MarshalAs (UnmanagedType.LPWStr)] string src,
 				[MarshalAs (UnmanagedType.U4)] int srclen,
 				[MarshalAs (UnmanagedType.U4)] out int rsize);
 		}
@@ -510,7 +510,7 @@ namespace System.Data.OracleClient.Oci
 			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIBindByName", "OCI");
-			return OciNativeCalls.OCIBindByName (stmtp, out bindpp, errhp, placeholder, placeh_len, valuep, 
+			return OciNativeCalls.OCIBindByName (stmtp, out bindpp, errhp, placeholder, placeh_len, valuep,
 				value_sz, dty, ref indp, alenp, rcodep, maxarr_len, curelp, mode);
 		}
 
@@ -527,10 +527,10 @@ namespace System.Data.OracleClient.Oci
 			IntPtr rcodep,
 			uint maxarr_len,
 			IntPtr curelp,
-			uint mode) 
+			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIBindByName", "OCI");
-			return OciNativeCalls.OCIBindByNameRef (stmtp, out bindpp, errhp, placeholder, placeh_len, ref valuep, 
+			return OciNativeCalls.OCIBindByNameRef (stmtp, out bindpp, errhp, placeholder, placeh_len, ref valuep,
 				value_sz, dty, ref indp, alenp, rcodep, maxarr_len, curelp, mode);
 		}
 
@@ -547,10 +547,10 @@ namespace System.Data.OracleClient.Oci
 			IntPtr rcodep,
 			uint maxarr_len,
 			IntPtr curelp,
-			uint mode) 
+			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIBindByName", "OCI");
-			return OciNativeCalls.OCIBindByNameBytes (stmtp, out bindpp, errhp, placeholder, placeh_len, valuep, 
+			return OciNativeCalls.OCIBindByNameBytes (stmtp, out bindpp, errhp, placeholder, placeh_len, valuep,
 				value_sz, dty, ref indp, alenp, rcodep, maxarr_len, curelp, mode);
 		}
 
@@ -566,10 +566,10 @@ namespace System.Data.OracleClient.Oci
 			IntPtr rcodep,
 			uint maxarr_len,
 			IntPtr curelp,
-			uint mode) 
+			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIBindByPos", "OCI");
-			return OciNativeCalls.OCIBindByPos (stmtp, out bindpp, errhp, position, valuep, 
+			return OciNativeCalls.OCIBindByPos (stmtp, out bindpp, errhp, position, valuep,
 				value_sz, dty, ref indp, alenp, rcodep, maxarr_len, curelp, mode);
 		}
 
@@ -585,10 +585,10 @@ namespace System.Data.OracleClient.Oci
 			IntPtr rcodep,
 			uint maxarr_len,
 			IntPtr curelp,
-			uint mode) 
+			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIBindByPos", "OCI");
-			return OciNativeCalls.OCIBindByPosRef (stmtp, out bindpp, errhp, position, ref valuep, 
+			return OciNativeCalls.OCIBindByPosRef (stmtp, out bindpp, errhp, position, ref valuep,
 				value_sz, dty, ref indp, alenp, rcodep, maxarr_len, curelp, mode);
 		}
 
@@ -604,10 +604,10 @@ namespace System.Data.OracleClient.Oci
 			IntPtr rcodep,
 			uint maxarr_len,
 			IntPtr curelp,
-			uint mode) 
+			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIBindByPos", "OCI");
-			return OciNativeCalls.OCIBindByPosBytes (stmtp, out bindpp, errhp, position, valuep, 
+			return OciNativeCalls.OCIBindByPosBytes (stmtp, out bindpp, errhp, position, valuep,
 				value_sz, dty, ref indp, alenp, rcodep, maxarr_len, curelp, mode);
 		}
 
@@ -655,7 +655,7 @@ namespace System.Data.OracleClient.Oci
 			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIDefineByPos", "OCI");
-			return OciNativeCalls.OCIDefineByPos (stmtp, out defnpp, errhp, position, valuep, 
+			return OciNativeCalls.OCIDefineByPos (stmtp, out defnpp, errhp, position, valuep,
 				value_sz, dty, ref indp, ref rlenp, rcodep, mode);
 		}
 
@@ -672,7 +672,7 @@ namespace System.Data.OracleClient.Oci
 			uint mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIDefineByPosPtr", "OCI");
-			return OciNativeCalls.OCIDefineByPosPtr (stmtp, out defnpp, errhp, position, ref valuep, 
+			return OciNativeCalls.OCIDefineByPosPtr (stmtp, out defnpp, errhp, position, ref valuep,
 				value_sz, dty, ref indp, ref rlenp, rcodep, mode);
 		}
 
@@ -860,7 +860,7 @@ namespace System.Data.OracleClient.Oci
 			byte csfrm)
 		{
 			Trace.WriteLineIf(traceOci, "OCILobRead", "OCI");
-			return OciNativeCalls.OCILobRead (svchp, errhp, locp, ref amtp, offset, bufp, bufl, 
+			return OciNativeCalls.OCILobRead (svchp, errhp, locp, ref amtp, offset, bufp, bufl,
 				ctxp, cbfp, csid, csfrm);
 		}
 
@@ -891,11 +891,11 @@ namespace System.Data.OracleClient.Oci
 				piece, ctxp, cbfp, csid, csfrm);
 		}
 
-		internal static int OCINlsGetInfo (IntPtr hndl, 
+		internal static int OCINlsGetInfo (IntPtr hndl,
 			IntPtr errhp,
 			ref byte[] bufp,
-			uint buflen, 
-			ushort item) 
+			uint buflen,
+			ushort item)
 		{
 			Trace.WriteLineIf(traceOci, "OCINlsGetInfo", "OCI");
 			return OciNativeCalls.OCINlsGetInfo (hndl, errhp, bufp, buflen, item);
@@ -923,7 +923,7 @@ namespace System.Data.OracleClient.Oci
 			IntPtr errhp,
 			ref byte[] bufp,
 			uint bufsz,
-			OciHandleType hndltype) 
+			OciHandleType hndltype)
 		{
 			Trace.WriteLineIf(traceOci, "OCIServerVersion", "OCI");
 			return OciNativeCalls.OCIServerVersion (hndlp,
@@ -972,11 +972,11 @@ namespace System.Data.OracleClient.Oci
 			OciExecuteMode mode)
 		{
 			Trace.WriteLineIf(traceOci, "OCIStmtExecute", "OCI");
-			
+
 			uint it = 0;
 			if (iters == true)
 				it = 1;
-			
+
 			return OciNativeCalls.OCIStmtExecute (svchp, stmthp, errhp, it, rowoff,
 				snap_in, snap_out, mode);
 		}
@@ -990,7 +990,7 @@ namespace System.Data.OracleClient.Oci
 			Trace.WriteLineIf(traceOci, "OCIStmtFetch", "OCI");
 			return OciNativeCalls.OCIStmtFetch (stmtp, errhp, nrows, orientation, mode);
 		}
-							
+
 
 		internal static int OCIStmtPrepare (IntPtr stmthp,
 			IntPtr errhp,
@@ -1000,7 +1000,7 @@ namespace System.Data.OracleClient.Oci
 			OciStatementMode mode)
 		{
 			Trace.WriteLineIf(traceOci, string.Format("OCIStmtPrepare ({0})", System.Text.Encoding.UTF8.GetString(stmt)), "OCI");
-			
+
 			return OciNativeCalls.OCIStmtPrepare (stmthp, errhp, stmt, stmt_length, language, mode);
 		}
 
@@ -1031,31 +1031,40 @@ namespace System.Data.OracleClient.Oci
 
 		internal static int OCICharSetToUnicode (
 			IntPtr svchp,
-			StringBuilder dst, 
+			StringBuilder dst,
 			byte [] src,
 			out int rsize)
 		{
 			Trace.WriteLineIf(traceOci, "OCICharSetToUnicode", "OCI");
-			
+
 			return OciNativeCalls.OCICharSetToUnicode (svchp, dst, dst!=null ? dst.Capacity : 0, src, src.Length, out rsize);
 		}
 
 		internal static int OCIUnicodeToCharSet (
 			IntPtr svchp,
 			byte [] dst,
-			[MarshalAs (UnmanagedType.LPWStr)] string src, 
+			[MarshalAs (UnmanagedType.LPWStr)] string src,
 			[MarshalAs (UnmanagedType.U4)] out int rsize)
 		{
 			Trace.WriteLineIf(traceOci, "OCICharSetToUnicode", "OCI");
-			
+
 			return OciNativeCalls.OCIUnicodeToCharSet (svchp, dst, dst!=null ? dst.Length : 0, src, src.Length, out rsize);
 		}
 
 		[DllImport ("oci")]
-		internal static extern int OCIDateTimeCheck (IntPtr hndl,
+		internal static extern int OCIDateTimeCheck (IntPtr hndl,
 			IntPtr err, IntPtr date, out uint valid);
 
 		#endregion
+
+		//http://download-uk.oracle.com/docs/cd/B14117_01/appdev.101/b10779/oci05bnd.htm#423147
+		internal static IntPtr AllocateClear (int cb)
+		{
+			IntPtr result = Marshal.AllocHGlobal ( cb);
+			for (int cleaner = 0; cleaner < cb; cleaner ++)
+				Marshal.WriteByte (result, cleaner, 0);
+			return result;
+		}
 	}
 }
 

+ 33 - 33
mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDefineHandle.cs

@@ -1,6 +1,6 @@
-// 
-// OciDefineHandle.cs 
-//  
+//
+// OciDefineHandle.cs
+//
 // Part of managed C#/.NET library System.Data.OracleClient.dll
 //
 // Part of the Mono class libraries at
@@ -8,21 +8,21 @@
 //
 // Assembly: System.Data.OracleClient.dll
 // Namespace: System.Data.OracleClient.Oci
-// 
-// Authors: 
+//
+// Authors:
 //     Tim Coleman <[email protected]>
 //     Daniel Morgan <[email protected]>
-//         
+//
 // Copyright (C) Tim Coleman, 2003
 // Copyright (C) Daniel Morgan, 2004
-// 
+//
 
 using System;
 using System.Data.OracleClient;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace System.Data.OracleClient.Oci 
+namespace System.Data.OracleClient.Oci
 {
 	internal sealed class OciDefineHandle : OciHandle, IDisposable
 	{
@@ -55,7 +55,7 @@ namespace System.Data.OracleClient.Oci
 		OciLobLocator lobLocator;
 		OciDateTimeDescriptor dateTimeDesc;
 		byte[] date;
-	
+
 		#endregion // Fields
 
 		#region Constructors
@@ -68,7 +68,7 @@ namespace System.Data.OracleClient.Oci
 		public void DefineByPosition (int position)
 		{
 			OciParameterDescriptor parameter = ((OciStatementHandle) Parent).GetParameter (position);
-			
+
 			name = parameter.GetName ();
 			definedType = parameter.GetDataType ();
 			definedSize = parameter.GetDataSize ();
@@ -125,7 +125,7 @@ namespace System.Data.OracleClient.Oci
 		{
 			switch (definedType) {
 			case OciDataType.Date:
-				DefineDate (position); 
+				DefineDate (position);
 				return;
 			case OciDataType.TimeStamp:
 				DefineTimeStamp (position);
@@ -156,12 +156,12 @@ namespace System.Data.OracleClient.Oci
 			}
 		}
 
-		void DefineTimeStamp (int position) 
+		void DefineTimeStamp (int position)
 		{
 			definedSize = -1;
 			ociType = OciDataType.TimeStamp;
 			fieldType = typeof(System.DateTime);
-		
+
 			dateTimeDesc = (OciDateTimeDescriptor) Parent.Parent.Allocate (OciHandleType.TimeStamp);
 			if (dateTimeDesc == null) {
 				OciErrorInfo info = ErrorHandle.HandleError ();
@@ -170,7 +170,7 @@ namespace System.Data.OracleClient.Oci
 
 			value = dateTimeDesc.Handle;
 			dateTimeDesc.ErrorHandle = ErrorHandle;
-			
+
 			int status = 0;
 
 			status = OciCalls.OCIDefineByPosPtr (Parent,
@@ -186,7 +186,7 @@ namespace System.Data.OracleClient.Oci
 				0);
 
 			definedSize = 11;
-		
+
 			if (status != 0) {
 				OciErrorInfo info = ErrorHandle.HandleError ();
 				throw new OracleException (info.ErrorCode, info.ErrorMessage);
@@ -199,7 +199,7 @@ namespace System.Data.OracleClient.Oci
 			ociType = OciDataType.Date;
 			fieldType = typeof(System.DateTime);
 
-			value = Marshal.AllocHGlobal (definedSize);
+			value = OciCalls.AllocateClear (definedSize);
 
 			int status = 0;
 
@@ -221,7 +221,7 @@ namespace System.Data.OracleClient.Oci
 			}
 		}
 
-		void DefineLong (int position) 
+		void DefineLong (int position)
 		{
 			fieldType = typeof (System.String);
 
@@ -235,8 +235,8 @@ namespace System.Data.OracleClient.Oci
 			// If you specify a definedSize less then the length of the column value,
 			// then you will get an OCI_ERROR ORA-01406: fetched column value was truncated
 			definedSize = LongVarCharMaxValue;
-			
-			value = Marshal.AllocHGlobal (definedSize);
+
+			value = OciCalls.AllocateClear (definedSize);
 			ociType = OciDataType.LongVarChar;
 
 			int status = 0;
@@ -264,12 +264,12 @@ namespace System.Data.OracleClient.Oci
 			fieldType = typeof (System.String);
 
 			int maxByteCount = Encoding.UTF8.GetMaxByteCount (definedSize);
-			value = Marshal.AllocHGlobal (maxByteCount);
+			value = OciCalls.AllocateClear (maxByteCount);
 
 			ociType = OciDataType.Char;
 
 			int status = 0;
-			
+
 			status = OciCalls.OCIDefineByPos (Parent,
 						out handle,
 						ErrorHandle,
@@ -288,15 +288,15 @@ namespace System.Data.OracleClient.Oci
 			}
 		}
 
-		void DefineNumber (int position) 
+		void DefineNumber (int position)
 		{
 			fieldType = typeof (System.Decimal);
-			value = Marshal.AllocHGlobal (definedSize);
+			value = OciCalls.AllocateClear (definedSize);
 
 			ociType = OciDataType.Char;
 
 			int status = 0;
-			
+
 			status = OciCalls.OCIDefineByPos (Parent,
 				out handle,
 				ErrorHandle,
@@ -364,7 +364,7 @@ namespace System.Data.OracleClient.Oci
 			ociType = OciDataType.Raw;
 			fieldType = Type.GetType("System.Byte[]");
 
-			value = Marshal.AllocHGlobal (definedSize);
+			value = OciCalls.AllocateClear (definedSize);
 
 			int status = 0;
 
@@ -385,7 +385,7 @@ namespace System.Data.OracleClient.Oci
 			}
 		}
 
-		protected override void Dispose (bool disposing) 
+		protected override void Dispose (bool disposing)
 		{
 			if (!disposed) {
 				try {
@@ -427,22 +427,22 @@ namespace System.Data.OracleClient.Oci
 			case OciDataType.RowIdDescriptor:
 				buffer = new byte [Size];
 				Marshal.Copy (Value, buffer, 0, Size);
-				
+
 				// Get length of returned string
 				int 	rsize = 0;
 				IntPtr	env = Parent.Parent;	// Parent is statement, grandparent is environment
 				OciCalls.OCICharSetToUnicode (env, null, buffer, out rsize);
-			
+
 				// Get string
 				StringBuilder ret = new StringBuilder(rsize);
 				OciCalls.OCICharSetToUnicode (env, ret, buffer, out rsize);
-	
+
 				return ret.ToString ();
 			case OciDataType.LongVarChar:
 			case OciDataType.Long:
 				buffer = new byte [LongVarCharMaxValue];
 				Marshal.Copy (Value, buffer, 0, buffer.Length);
-				
+
 				int longSize = 0;
 				if (BitConverter.IsLittleEndian)
 					longSize = BitConverter.ToInt32 (new byte[]{buffer[0], buffer[1], buffer[2], buffer[3]}, 0);
@@ -519,11 +519,11 @@ namespace System.Data.OracleClient.Oci
 			byte minute = Marshal.ReadByte (value, 5);
 			byte second = Marshal.ReadByte (value, 6);
 
-			if (hour == 0) 
+			if (hour == 0)
 				hour ++;
-			if (minute == 0) 
+			if (minute == 0)
 				minute ++;
-			if (second == 0) 
+			if (second == 0)
 				second ++;
 
 			return new DateTime ((century - 100) * 100 + (year - 100),

+ 31 - 31
mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciErrorHandle.cs

@@ -1,6 +1,6 @@
-// 
-// OciErrorHandle.cs 
-//  
+//
+// OciErrorHandle.cs
+//
 // Part of managed C#/.NET library System.Data.OracleClient.dll
 //
 // Part of the Mono class libraries at
@@ -8,12 +8,12 @@
 //
 // Assembly: System.Data.OracleClient.dll
 // Namespace: System.Data.OracleClient.Oci
-// 
-// Author: 
+//
+// Author:
 //     Tim Coleman <[email protected]>
-//         
+//
 // Copyright (C) Tim Coleman, 2003
-// 
+//
 
 using System;
 using System.Runtime.InteropServices;
@@ -47,16 +47,16 @@ namespace System.Data.OracleClient.Oci {
 			}
 		}
 
-		public static OciErrorInfo HandleError (OciHandle hand) 
+		public static OciErrorInfo HandleError (OciHandle hand)
 		{
 			OciErrorInfo info;
 			info.ErrorCode = 0;
 			info.ErrorMessage = String.Empty;
 
 			int errbufSize = 4096;
-			IntPtr errbuf = Marshal.AllocHGlobal (errbufSize);
+			IntPtr errbuf = OciCalls.AllocateClear (errbufSize);
 
-			OciCalls.OCIErrorGet (hand, 
+			OciCalls.OCIErrorGet (hand,
 				1,
 				IntPtr.Zero,
 				out info.ErrorCode,
@@ -64,32 +64,32 @@ namespace System.Data.OracleClient.Oci {
 				(uint) errbufSize,
 				OciHandleType.Error);
 
-			byte[] bytea = new byte[errbufSize];
-			Marshal.Copy (errbuf, bytea, 0, errbufSize);
-			errbufSize = 0;
-			
-			OciHandle h = hand.Parent;
-			if (h == null)
-				h = hand;
-
-			// first call to OCICharSetToUnicode gets the size
-			OciCalls.OCICharSetToUnicode (h, null, bytea, out errbufSize);
-			StringBuilder str = new StringBuilder (errbufSize);
-			
-			// second call to OCICharSetToUnicode gets the string
-			OciCalls.OCICharSetToUnicode (h, str, bytea, out errbufSize);
-			
-			string errmsg = String.Empty;
-			if (errbufSize > 0)
-				errmsg = str.ToString ();
-			
-			info.ErrorMessage = String.Copy (errmsg);
+			byte[] bytea = new byte[errbufSize];
+			Marshal.Copy (errbuf, bytea, 0, errbufSize);
+			errbufSize = 0;
+
+			OciHandle h = hand.Parent;
+			if (h == null)
+				h = hand;
+
+			// first call to OCICharSetToUnicode gets the size
+			OciCalls.OCICharSetToUnicode (h, null, bytea, out errbufSize);
+			StringBuilder str = new StringBuilder (errbufSize);
+
+			// second call to OCICharSetToUnicode gets the string
+			OciCalls.OCICharSetToUnicode (h, str, bytea, out errbufSize);
+
+			string errmsg = String.Empty;
+			if (errbufSize > 0)
+				errmsg = str.ToString ();
+
+			info.ErrorMessage = String.Copy (errmsg);
 			Marshal.FreeHGlobal (errbuf);
 
 			return info;
 		}
 
-		public OciErrorInfo HandleError () 
+		public OciErrorInfo HandleError ()
 		{
 			return HandleError (this);
 		}

+ 14 - 14
mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciRowIdDescriptor.cs

@@ -1,6 +1,6 @@
-// 
-// OciRowIdDescriptor.cs 
-//  
+//
+// OciRowIdDescriptor.cs
+//
 // Part of managed C#/.NET library System.Data.OracleClient.dll
 //
 // Part of the Mono class libraries at
@@ -8,12 +8,12 @@
 //
 // Assembly: System.Data.OracleClient.dll
 // Namespace: System.Data.OracleClient.Oci
-// 
-// Author: 
+//
+// Author:
 //     Tim Coleman <[email protected]>
-//         
+//
 // Copyright (C) Tim Coleman, 2003
-// 
+//
 
 using System;
 using System.Data.OracleClient;
@@ -39,15 +39,15 @@ namespace System.Data.OracleClient.Oci {
 
 		#region Methods
 
-		
+
 		//FIXME: This method only exists in Oracle 9i
 /*
-		[DllImport ("oci")] 
+		[DllImport ("oci")]
 		static extern int OCIRowidToChar (IntPtr rowidDesc,
 						IntPtr outbfp,
 						ref int outbflp,
 						IntPtr errhp);
-*/		
+*/
 
 		protected override void Dispose (bool disposing)
 		{
@@ -61,9 +61,9 @@ namespace System.Data.OracleClient.Oci {
 		public string GetRowId (OciErrorHandle errorHandle)
 		{
 			string output = String.Empty;
-/*			
+/*
 			int len = 10;
-			IntPtr outputPtr = Marshal.AllocHGlobal (len); // FIXME: how big should this be?
+			IntPtr outputPtr = OciCalls.AllocateClear (len); // FIXME: how big should this be?
 
 			int status = 0;
 
@@ -82,11 +82,11 @@ namespace System.Data.OracleClient.Oci {
 				if (str != null)
 					output = String.Copy ((string) str);
 			}
-*/			
+*/
 			output = "NOT YET SUPPORTED.";
 
 			return output;
-		} 
+		}
 
 		#endregion // Methods
 	}

+ 38 - 38
mcs/class/System.Data.OracleClient/System.Data.OracleClient.sln

@@ -1,38 +1,38 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient", "System.Data.OracleClient.vmwcsproj", "{168E2978-1640-405C-99B8-8CD81B27BC92}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data", "..\System.Data\System.Data.vmwcsproj", "{12CA069B-C324-48C1-9836-0014497A212C}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug_Java = Debug_Java
-		Release = Release
-		Release_Java = Release_Java
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug.ActiveCfg = Debug_Java|.NET
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug.Build.0 = Debug_Java|.NET
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug_Java.Build.0 = Debug_Java|.NET
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release.ActiveCfg = Release_Java|.NET
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release.Build.0 = Release_Java|.NET
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release_Java.ActiveCfg = Release_Java|.NET
-		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release_Java.Build.0 = Release_Java|.NET
-		{12CA069B-C324-48C1-9836-0014497A212C}.Debug.ActiveCfg = Debug|.NET
-		{12CA069B-C324-48C1-9836-0014497A212C}.Debug.Build.0 = Debug|.NET
-		{12CA069B-C324-48C1-9836-0014497A212C}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{12CA069B-C324-48C1-9836-0014497A212C}.Release.ActiveCfg = Release|.NET
-		{12CA069B-C324-48C1-9836-0014497A212C}.Release.Build.0 = Release|.NET
-		{12CA069B-C324-48C1-9836-0014497A212C}.Release_Java.ActiveCfg = Release_Java|.NET
-		{12CA069B-C324-48C1-9836-0014497A212C}.Release_Java.Build.0 = Release_Java|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient", "System.Data.OracleClient.vmwcsproj", "{168E2978-1640-405C-99B8-8CD81B27BC92}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data", "..\System.Data\System.Data.vmwcsproj", "{12CA069B-C324-48C1-9836-0014497A212C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Debug_Java = Debug_Java
+		Release = Release
+		Release_Java = Release_Java
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug.ActiveCfg = Debug_Java|.NET
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug.Build.0 = Debug_Java|.NET
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Debug_Java.Build.0 = Debug_Java|.NET
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release.ActiveCfg = Release_Java|.NET
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release.Build.0 = Release_Java|.NET
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release_Java.ActiveCfg = Release_Java|.NET
+		{168E2978-1640-405C-99B8-8CD81B27BC92}.Release_Java.Build.0 = Release_Java|.NET
+		{12CA069B-C324-48C1-9836-0014497A212C}.Debug.ActiveCfg = Debug|.NET
+		{12CA069B-C324-48C1-9836-0014497A212C}.Debug.Build.0 = Debug|.NET
+		{12CA069B-C324-48C1-9836-0014497A212C}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{12CA069B-C324-48C1-9836-0014497A212C}.Release.ActiveCfg = Release|.NET
+		{12CA069B-C324-48C1-9836-0014497A212C}.Release.Build.0 = Release|.NET
+		{12CA069B-C324-48C1-9836-0014497A212C}.Release_Java.ActiveCfg = Release_Java|.NET
+		{12CA069B-C324-48C1-9836-0014497A212C}.Release_Java.Build.0 = Release_Java|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

+ 47 - 47
mcs/class/System.Data.OracleClient/System.Data.OracleClient.vmwcsproj

@@ -1,47 +1,47 @@
-<VisualStudioProject>
-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{168E2978-1640-405C-99B8-8CD81B27BC92}">
-		<Build>
-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.Data.OracleClient" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.Data.OracleClient" RunPostBuildEvent="OnBuildSuccess" StartupObject="">
-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
-			</Settings>
-			<References>
-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>
-				<Reference Name="System.Data" Project="{12CA069B-C324-48C1-9836-0014497A212C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>
-				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"/>
-			</References>
-		</Build>
-		<Files>
-			<Include>
-				<File RelPath="Assembly\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="Assembly\Consts.cs.in" Link="..\..\build\common\Consts.cs.in" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="Assembly\Locale.cs" Link="..\..\build\common\Locale.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="Assembly\MonoTODOAttribute.cs" Link="..\..\build\common\MonoTODOAttribute.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="Mainsoft.Data.Jdbc.Providers.jvm\OracleProvider.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient\OracleDataAdapter.cs" SubType="Component" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient\OracleInfoMessageEventHandler.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient\OracleType.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\ExceptionHelper.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand.cs" SubType="Component" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommandBuilder.cs" SubType="Component" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection.cs" SubType="Component" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConvert.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleError.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleErrorCollection.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleException.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleInfoMessageEventArgs.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\Regex.cs" SubType="Code" BuildAction="Compile"/>
-			</Include>
-		</Files>
-		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" REFS.JarPath.system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"/>
-	</CSHARP>
-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>
+<VisualStudioProject>
+	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{168E2978-1640-405C-99B8-8CD81B27BC92}">
+		<Build>
+			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.Data.OracleClient" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.Data.OracleClient" RunPostBuildEvent="OnBuildSuccess" StartupObject="">
+				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
+				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;TARGET_JVM" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
+			</Settings>
+			<References>
+				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
+				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>
+				<Reference Name="System.Data" Project="{12CA069B-C324-48C1-9836-0014497A212C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>
+				<Reference Name="System.Drawing" AssemblyName="System.Drawing" HintPath="..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"/>
+			</References>
+		</Build>
+		<Files>
+			<Include>
+				<File RelPath="Assembly\AssemblyInfo.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="Assembly\Consts.cs.in" Link="..\..\build\common\Consts.cs.in" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="Assembly\Locale.cs" Link="..\..\build\common\Locale.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="Assembly\MonoTODOAttribute.cs" Link="..\..\build\common\MonoTODOAttribute.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="Mainsoft.Data.Jdbc.Providers.jvm\OracleProvider.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient\OracleDataAdapter.cs" SubType="Component" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient\OracleInfoMessageEventHandler.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient\OracleType.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\ExceptionHelper.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand.cs" SubType="Component" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommandBuilder.cs" SubType="Component" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection.cs" SubType="Component" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConvert.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleError.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleErrorCollection.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleException.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleInfoMessageEventArgs.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameter.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\Regex.cs" SubType="Code" BuildAction="Compile"/>
+			</Include>
+		</Files>
+		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" REFS.JarPath.system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\mlibwrapper_jai.jar"/>
+	</CSHARP>
+	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>

+ 4 - 0
mcs/class/System.Data.OracleClient/System.Data.OracleClient/ChangeLog

@@ -1,3 +1,7 @@
+2007-01-04 Leszek Ciesielski <[email protected]>
+	* OracleParameter.cs:  padding the allocated memory  with 0's (this is what OCI
+	expects)
+
 2006-10-19  Leszek Ciesielski <[email protected]>
 	* OracleConnection.cs: moved setting SessionFormatProvider from Open() into first access to it.
 	* OracleParameter.cs: made exception in InferOracleType a bit more verbose.

+ 36 - 36
mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameter.cs

@@ -1,4 +1,4 @@
-// 
+//
 // OracleParameter.cs
 //
 // Part of the Mono class libraries at
@@ -7,7 +7,7 @@
 // Assembly: System.Data.OracleClient.dll
 // Namespace: System.Data.OracleClient
 //
-// Authors: 
+// Authors:
 //    Tim Coleman <[email protected]>
 //    Daniel Moragn <[email protected]>
 //    Hubert FONGARNAND <[email protected]>
@@ -181,7 +181,7 @@ namespace System.Data.OracleClient {
 			get { return oracleType; }
 			set { SetOracleType (value); }
 		}
-		
+
 		[DefaultValue ("")]
 		public string ParameterName {
 			get { return name; }
@@ -203,9 +203,9 @@ namespace System.Data.OracleClient {
 		[DefaultValue (0)]
 		public int Size {
 			get { return size; }
-			set { 
+			set {
 				sizeSet = true;
-				size = value; 
+				size = value;
 			}
 		}
 
@@ -306,20 +306,20 @@ namespace System.Data.OracleClient {
 					case OciDataType.OciString:
 						bindType = OciDataType.Char;
 						bindSize = size * 2;
-						bindOutValue = Marshal.AllocHGlobal (bindSize);
+						bindOutValue = OciCalls.AllocateClear (bindSize);
 						bindValue = bindOutValue;
 						break;
 					case OciDataType.RowIdDescriptor:
 						size = 10;
 						bindType = OciDataType.Char;
 						bindSize = size * 2;
-						bindOutValue = Marshal.AllocHGlobal (bindSize);
+						bindOutValue = OciCalls.AllocateClear (bindSize);
 						bindValue = bindOutValue;
 						break;
 					case OciDataType.Date:
 						bindSize = 7;
 						bindType = OciDataType.Date;
-						bindOutValue = Marshal.AllocHGlobal (bindSize);
+						bindOutValue = OciCalls.AllocateClear (bindSize);
 						bindValue = bindOutValue;
 						break;
 					case OciDataType.TimeStamp:
@@ -338,7 +338,7 @@ namespace System.Data.OracleClient {
 					case OciDataType.Number:
 						bindSize = 22;
 						bindType = OciDataType.Char;
-						bindOutValue = Marshal.AllocHGlobal (bindSize);
+						bindOutValue = OciCalls.AllocateClear (bindSize);
 						bindValue = bindOutValue;
 						break;
 					case OciDataType.Long:
@@ -347,7 +347,7 @@ namespace System.Data.OracleClient {
 						// therefore, you must allocate an insane size
 						// see OciDefineHandle
 						bindSize = OciDefineHandle.LongVarCharMaxValue;
-						bindOutValue = Marshal.AllocHGlobal (bindSize);
+						bindOutValue = OciCalls.AllocateClear (bindSize);
 						bindType = OciDataType.LongVarChar;
 						bindValue = bindOutValue;
 						break;
@@ -364,7 +364,7 @@ namespace System.Data.OracleClient {
 						lobLocator.ErrorHandle = connection.ErrorHandle;
 						lobLocator.Service = statement.Service;
 						useRef = true;
-						break;					
+						break;
 					case OciDataType.RSet: // REF CURSOR
 						cursor = IntPtr.Zero;
 						OciCalls.OCIHandleAlloc (connection.Environment,
@@ -372,10 +372,10 @@ namespace System.Data.OracleClient {
 							OciHandleType.Statement,
 							0,
 							IntPtr.Zero);
-							
+
 						bindSize = 0;
 						bindType = OciDataType.RSet;
-						break;					
+						break;
 					default:
 						// define other types
 						throw new NotImplementedException ();
@@ -413,7 +413,7 @@ namespace System.Data.OracleClient {
 					}
 					else
 						throw new NotImplementedException (); // ?
-					
+
 					short year = (short) dt.Year;
 					byte month = (byte) dt.Month;
 					byte day = (byte) dt.Day;
@@ -429,7 +429,7 @@ namespace System.Data.OracleClient {
 					}
 					dateTimeDesc.ErrorHandle = connection.ErrorHandle;
 					dateTimeDesc.SetDateTime (connection.Session,
-						connection.ErrorHandle, 
+						connection.ErrorHandle,
 						year, month, day, hour, min, sec, fsec,
 						timezone);
 					useRef = true;
@@ -466,10 +466,10 @@ namespace System.Data.OracleClient {
 				else if (oracleType == OracleType.Clob) {
 					string sv = v.ToString();
 					rsize = 0;
-			
+
 					// Get size of buffer
 					OciCalls.OCIUnicodeToCharSet (statement.Parent, null, sv, out rsize);
-			
+
 					// Fill buffer
 					bytes = new byte[rsize];
 					OciCalls.OCIUnicodeToCharSet (statement.Parent, bytes, sv, out rsize);
@@ -479,7 +479,7 @@ namespace System.Data.OracleClient {
 				}
 				else if (oracleType == OracleType.Raw) {
 					byte[] val = v as byte[];
-					bindValue = Marshal.AllocHGlobal (val.Length);
+					bindValue = OciCalls.AllocateClear (val.Length);
 					Marshal.Copy (val, 0, bindValue, val.Length);
 					bindSize = val.Length;
 				}
@@ -495,10 +495,10 @@ namespace System.Data.OracleClient {
                                         else
                                                 svalue = v.ToString();
 					rsize = 0;
-			
+
 					// Get size of buffer
 					OciCalls.OCIUnicodeToCharSet (statement.Parent, null, svalue, out rsize);
-			
+
 					// Fill buffer
 					bytes = new byte[rsize];
 					OciCalls.OCIUnicodeToCharSet (statement.Parent, bytes, svalue, out rsize);
@@ -509,10 +509,10 @@ namespace System.Data.OracleClient {
 				else {
 					string svalue = v.ToString () + '\0';
 					rsize = 0;
-			
+
 					// Get size of buffer
 					OciCalls.OCIUnicodeToCharSet (statement.Parent, null, svalue, out rsize);
-			
+
 					// Fill buffer
 					bytes = new byte[rsize];
 					OciCalls.OCIUnicodeToCharSet (statement.Parent, bytes, svalue, out rsize);
@@ -573,7 +573,7 @@ namespace System.Data.OracleClient {
 					IntPtr.Zero,
 					0,
 					IntPtr.Zero,
-					0);					
+					0);
 			}
 			else if (bytes != null) {
 				status = OciCalls.OCIBindByNameBytes (statement,
@@ -596,7 +596,7 @@ namespace System.Data.OracleClient {
 					out tmpHandle,
 					connection.ErrorHandle,
 					ParameterName,
-					ParameterName.Length,
+					ParameterName.Length, // FIXME: this should be in bytes!
 					bindValue,
 					bindSize,
 					bindType,
@@ -669,7 +669,7 @@ namespace System.Data.OracleClient {
 		private int InferSize ()
 		{
 			int newSize = 0;
-			
+
 			switch (ociType) {
 			case OciDataType.VarChar2:
 			case OciDataType.String:
@@ -697,12 +697,12 @@ namespace System.Data.OracleClient {
 				break;
 			case OciDataType.TimeStamp:
 				newSize = 11;
- 				break;		
+ 				break;
 			case OciDataType.Blob:
 			case OciDataType.Clob:
 			case OciDataType.RSet: // REF CURSOR
 				newSize = -1;
-				break;					
+				break;
 			default:
 				if (value == null || value == DBNull.Value)
 					newSize = 0;
@@ -890,7 +890,7 @@ namespace System.Data.OracleClient {
 			return ParameterName;
 		}
 
-		private void GetOutValue (OracleCommand cmd) 
+		private void GetOutValue (OracleCommand cmd)
 		{
 			// used to update the parameter value
 			// for Output, the output of InputOutput, and Return parameters
@@ -911,16 +911,16 @@ namespace System.Data.OracleClient {
 			case OciDataType.RowIdDescriptor:
 				buffer = new byte [Size];
 				Marshal.Copy (bindOutValue, buffer, 0, Size);
-				
+
 				// Get length of returned string
 				int 	rsize = 0;
 				IntPtr	env = cmd.Connection.Environment;
 				OciCalls.OCICharSetToUnicode (env, null, buffer, out rsize);
-			
+
 				// Get string
 				StringBuilder ret = new StringBuilder(rsize);
 				OciCalls.OCICharSetToUnicode (env, ret, buffer, out rsize);
-	
+
 				value = ret.ToString ();
 				break;
 			case OciDataType.Integer:
@@ -935,7 +935,7 @@ namespace System.Data.OracleClient {
 				break;
 			case OciDataType.Date:
 				value = UnpackDate (bindOutValue);
-				break;	
+				break;
 			case OciDataType.Blob:
 			case OciDataType.Clob:
 				OracleLob lob = new OracleLob (lobLocator, ociType);
@@ -958,11 +958,11 @@ namespace System.Data.OracleClient {
 			buffer = null;
 		}
 
-		internal void Update (OracleCommand cmd) 
+		internal void Update (OracleCommand cmd)
 		{
 			if (Direction != ParameterDirection.Input)
 				GetOutValue (cmd);
-			
+
 			FreeHandle ();
 		}
 
@@ -981,7 +981,7 @@ namespace System.Data.OracleClient {
                         default:
                                 Marshal.FreeHGlobal (bindOutValue);
                                 break;
-			} 
+			}
 
 			bindOutValue = IntPtr.Zero;
 			bindValue = IntPtr.Zero;
@@ -1012,7 +1012,7 @@ namespace System.Data.OracleClient {
 
 		}
 
-		internal byte[] PackDate (DateTime dateValue) 
+		internal byte[] PackDate (DateTime dateValue)
 		{
 			byte[] buffer = new byte[7];
 

+ 36 - 36
mcs/class/System.Data.OracleClient/System.Data.OracleClient20.sln

@@ -1,36 +1,36 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient20", "System.Data.OracleClient20.vmwcsproj", "{71F3DF41-7E2F-41FB-B470-110851F2E758}"
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data20", "..\System.Data\System.Data20.vmwcsproj", "{BD83C476-AEC7-4535-8158-977B04887AF0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_Java|Any CPU = Debug_Java|Any CPU
-		Debug_Java20|Any CPU = Debug_Java20|Any CPU
-		Release_Java|Any CPU = Release_Java|Any CPU
-		Release_Java20|Any CPU = Release_Java20|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
-		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
-		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient20", "System.Data.OracleClient20.vmwcsproj", "{71F3DF41-7E2F-41FB-B470-110851F2E758}"
+EndProject
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data20", "..\System.Data\System.Data20.vmwcsproj", "{BD83C476-AEC7-4535-8158-977B04887AF0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Java|Any CPU = Debug_Java|Any CPU
+		Debug_Java20|Any CPU = Debug_Java20|Any CPU
+		Release_Java|Any CPU = Release_Java|Any CPU
+		Release_Java20|Any CPU = Release_Java20|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{71F3DF41-7E2F-41FB-B470-110851F2E758}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{BD83C476-AEC7-4535-8158-977B04887AF0}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

+ 163 - 163
mcs/class/System.Data.OracleClient/System.Data.OracleClient20.vmwcsproj

@@ -1,163 +1,163 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<ProductVersion>8.0.50727</ProductVersion>
-		<SchemaVersion>2.0</SchemaVersion>
-		<ProjectGuid>{71F3DF41-7E2F-41FB-B470-110851F2E758}</ProjectGuid>
-		<OutputType>Library</OutputType>
-		<AppDesignerFolder>Properties</AppDesignerFolder>
-		<RootNamespace>System.Data.OracleClient</RootNamespace>
-		<AssemblyName>System.Data.OracleClient</AssemblyName>
-		<JDKName>1.5.0_05</JDKName>
-		<GHProjectType>1</GHProjectType>
-		<GHProjectKind>framework</GHProjectKind>
-		<Version>2.0</Version>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
-		<OutputPath>bin\Release_Java20\</OutputPath>
-		<DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
-		<BaseAddress>285212672</BaseAddress>
-		<Optimize>true</Optimize>
-		<DebugType>pdbonly</DebugType>
-		<PlatformTarget>AnyCPU</PlatformTarget>
-		<ErrorReport>prompt</ErrorReport>
-		<SkipValidation>True</SkipValidation>
-		<KeepIntermediate>false</KeepIntermediate>
-		<GHProjectType>1</GHProjectType>
-		<PreCompile>false</PreCompile>
-		<AdditionalClassPath>
-		</AdditionalClassPath>
-		<ApplicationServerType>
-		</ApplicationServerType>
-		<Version>2.0</Version>
-		<JDKName>1.5.0_05</JDKName>
-		<TargetPlatform>0</TargetPlatform>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
-		<DebugSymbols>true</DebugSymbols>
-		<OutputPath>bin\Debug_Java20\</OutputPath>
-		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
-		<BaseAddress>285212672</BaseAddress>
-		<DebugType>full</DebugType>
-		<PlatformTarget>AnyCPU</PlatformTarget>
-		<ErrorReport>prompt</ErrorReport>
-		<SkipValidation>True</SkipValidation>
-		<KeepIntermediate>False</KeepIntermediate>
-		<GHProjectType>1</GHProjectType>
-		<PreCompile>false</PreCompile>
-		<AdditionalClassPath>
-		</AdditionalClassPath>
-		<ApplicationServerType>
-		</ApplicationServerType>
-		<Version>2.0</Version>
-		<JDKName>1.5.0_05</JDKName>
-		<TargetPlatform>0</TargetPlatform>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
-		<DebugSymbols>true</DebugSymbols>
-		<DebugType>full</DebugType>
-		<Optimize>false</Optimize>
-		<OutputPath>bin\Debug_Java\</OutputPath>
-		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-		<BaseAddress>285212672</BaseAddress>
-		<NoStdLib>false</NoStdLib>
-		<SkipValidation>True</SkipValidation>
-		<KeepIntermediate>False</KeepIntermediate>
-		<TargetPlatform>0</TargetPlatform>
-		<AdditionalClassPath>
-		</AdditionalClassPath>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
-		<DebugType>pdbonly</DebugType>
-		<Optimize>true</Optimize>
-		<OutputPath>bin\Release_Java\</OutputPath>
-		<DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-		<BaseAddress>285212672</BaseAddress>
-		<NoStdLib>false</NoStdLib>
-		<SkipValidation>false</SkipValidation>
-		<KeepIntermediate>false</KeepIntermediate>
-		<TargetPlatform>0</TargetPlatform>
-		<AdditionalClassPath>
-		</AdditionalClassPath>
-	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>
-	<Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets"/>
-	<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-	<ProjectExtensions>
-		<VisualStudio>
-			<UserProperties REFS-JarPath-system-drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-rt="..\lib\rt.jar"/>
-		</VisualStudio>
-	</ProjectExtensions>
-	<ItemGroup>
-		<Compile Include="..\..\build\common\Locale.cs">
-			<Link>Assembly\Locale.cs</Link>
-		</Compile>
-		<Compile Include="..\..\build\common\MonoTODOAttribute.cs">
-			<Link>Assembly\MonoTODOAttribute.cs</Link>
-		</Compile>
-		<Compile Include="Assembly\AssemblyInfo.cs"/>
-		<Compile Include="Mainsoft.Data.Jdbc.Providers.jvm\OracleProvider.cs"/>
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="..\..\build\common\Consts.cs.in">
-			<Link>Assembly\Consts.cs.in</Link>
-		</Compile>
-		<Compile Include="System.Data.OracleClient.jvm\ExceptionHelper.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleCommand.cs">
-			<SubType>Component</SubType>
-		</Compile>
-		<Compile Include="System.Data.OracleClient.jvm\OracleCommandBuilder.cs">
-			<SubType>Component</SubType>
-		</Compile>
-		<Compile Include="System.Data.OracleClient.jvm\OracleConnection.cs">
-			<SubType>Component</SubType>
-		</Compile>
-		<Compile Include="System.Data.OracleClient.jvm\OracleConvert.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleDataReader.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleError.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleErrorCollection.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleException.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleInfoMessageEventArgs.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleParameter.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\OracleTransaction.cs"/>
-		<Compile Include="System.Data.OracleClient.jvm\Regex.cs"/>
-		<Compile Include="System.Data.OracleClient\OracleDataAdapter.cs">
-			<SubType>Component</SubType>
-		</Compile>
-		<Compile Include="System.Data.OracleClient\OracleInfoMessageEventHandler.cs"/>
-		<Compile Include="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs"/>
-		<Compile Include="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs"/>
-		<Compile Include="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs"/>
-		<Compile Include="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs"/>
-		<Compile Include="System.Data.OracleClient\OracleType.cs"/>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\System.Data\System.Data20.vmwcsproj">
-			<Project>{BD83C476-AEC7-4535-8158-977B04887AF0}</Project>
-			<Name>System.Data</Name>
-		</ProjectReference>
-	</ItemGroup>
-	<ItemGroup>
-		<Reference Include="rt">
-			<HintPath>..\lib\rt.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="System"/>
-		<Reference Include="System.Drawing"/>
-	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="Properties\"/>
-	</ItemGroup>
-</Project>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProductVersion>8.0.50727</ProductVersion>
+		<SchemaVersion>2.0</SchemaVersion>
+		<ProjectGuid>{71F3DF41-7E2F-41FB-B470-110851F2E758}</ProjectGuid>
+		<OutputType>Library</OutputType>
+		<AppDesignerFolder>Properties</AppDesignerFolder>
+		<RootNamespace>System.Data.OracleClient</RootNamespace>
+		<AssemblyName>System.Data.OracleClient</AssemblyName>
+		<JDKName>1.5.0_05</JDKName>
+		<GHProjectType>1</GHProjectType>
+		<GHProjectKind>framework</GHProjectKind>
+		<Version>2.0</Version>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
+		<OutputPath>bin\Release_Java20\</OutputPath>
+		<DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
+		<BaseAddress>285212672</BaseAddress>
+		<Optimize>true</Optimize>
+		<DebugType>pdbonly</DebugType>
+		<PlatformTarget>AnyCPU</PlatformTarget>
+		<ErrorReport>prompt</ErrorReport>
+		<SkipValidation>True</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<GHProjectType>1</GHProjectType>
+		<PreCompile>false</PreCompile>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+		<ApplicationServerType>
+		</ApplicationServerType>
+		<Version>2.0</Version>
+		<JDKName>1.5.0_05</JDKName>
+		<TargetPlatform>0</TargetPlatform>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<OutputPath>bin\Debug_Java20\</OutputPath>
+		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
+		<BaseAddress>285212672</BaseAddress>
+		<DebugType>full</DebugType>
+		<PlatformTarget>AnyCPU</PlatformTarget>
+		<ErrorReport>prompt</ErrorReport>
+		<SkipValidation>True</SkipValidation>
+		<KeepIntermediate>False</KeepIntermediate>
+		<GHProjectType>1</GHProjectType>
+		<PreCompile>false</PreCompile>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+		<ApplicationServerType>
+		</ApplicationServerType>
+		<Version>2.0</Version>
+		<JDKName>1.5.0_05</JDKName>
+		<TargetPlatform>0</TargetPlatform>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>bin\Debug_Java\</OutputPath>
+		<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<BaseAddress>285212672</BaseAddress>
+		<NoStdLib>false</NoStdLib>
+		<SkipValidation>True</SkipValidation>
+		<KeepIntermediate>False</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\Release_Java\</OutputPath>
+		<DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<BaseAddress>285212672</BaseAddress>
+		<NoStdLib>false</NoStdLib>
+		<SkipValidation>false</SkipValidation>
+		<KeepIntermediate>false</KeepIntermediate>
+		<TargetPlatform>0</TargetPlatform>
+		<AdditionalClassPath>
+		</AdditionalClassPath>
+	</PropertyGroup>
+	<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>
+	<Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets"/>
+	<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties REFS-JarPath-system-drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_imageio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_core.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\jai_codec.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\clibwrapper_jiio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mlibwrapper_jai.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-rt="..\lib\rt.jar"/>
+		</VisualStudio>
+	</ProjectExtensions>
+	<ItemGroup>
+		<Compile Include="..\..\build\common\Locale.cs">
+			<Link>Assembly\Locale.cs</Link>
+		</Compile>
+		<Compile Include="..\..\build\common\MonoTODOAttribute.cs">
+			<Link>Assembly\MonoTODOAttribute.cs</Link>
+		</Compile>
+		<Compile Include="Assembly\AssemblyInfo.cs"/>
+		<Compile Include="Mainsoft.Data.Jdbc.Providers.jvm\OracleProvider.cs"/>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Include="..\..\build\common\Consts.cs.in">
+			<Link>Assembly\Consts.cs.in</Link>
+		</Compile>
+		<Compile Include="System.Data.OracleClient.jvm\ExceptionHelper.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleCommand.cs">
+			<SubType>Component</SubType>
+		</Compile>
+		<Compile Include="System.Data.OracleClient.jvm\OracleCommandBuilder.cs">
+			<SubType>Component</SubType>
+		</Compile>
+		<Compile Include="System.Data.OracleClient.jvm\OracleConnection.cs">
+			<SubType>Component</SubType>
+		</Compile>
+		<Compile Include="System.Data.OracleClient.jvm\OracleConvert.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleDataReader.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleError.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleErrorCollection.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleException.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleInfoMessageEventArgs.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleParameter.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\OracleTransaction.cs"/>
+		<Compile Include="System.Data.OracleClient.jvm\Regex.cs"/>
+		<Compile Include="System.Data.OracleClient\OracleDataAdapter.cs">
+			<SubType>Component</SubType>
+		</Compile>
+		<Compile Include="System.Data.OracleClient\OracleInfoMessageEventHandler.cs"/>
+		<Compile Include="System.Data.OracleClient\OracleRowUpdatedEventArgs.cs"/>
+		<Compile Include="System.Data.OracleClient\OracleRowUpdatedEventHandler.cs"/>
+		<Compile Include="System.Data.OracleClient\OracleRowUpdatingEventArgs.cs"/>
+		<Compile Include="System.Data.OracleClient\OracleRowUpdatingEventHandler.cs"/>
+		<Compile Include="System.Data.OracleClient\OracleType.cs"/>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\System.Data\System.Data20.vmwcsproj">
+			<Project>{BD83C476-AEC7-4535-8158-977B04887AF0}</Project>
+			<Name>System.Data</Name>
+		</ProjectReference>
+	</ItemGroup>
+	<ItemGroup>
+		<Reference Include="rt">
+			<HintPath>..\lib\rt.dll</HintPath>
+			<Private>False</Private>
+		</Reference>
+		<Reference Include="System"/>
+		<Reference Include="System.Drawing"/>
+	</ItemGroup>
+	<ItemGroup>
+		<Folder Include="Properties\"/>
+	</ItemGroup>
+</Project>

+ 12 - 12
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.J2EE.config

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-	<appSettings>
-		<add key="ConnectionString" value="hostname=powergh;port=1521;User ID=ghtdb;Password=ghtdb;ServiceName=powergh;Data Source=powergh" />
-		<!--
-		<add key="ConnectionString" value="Provider=SQLOLEDB.1;Data Source=xp050;Initial Catalog=GHTDB;User Id=sa;Password=" />
-		<add key="ConnectionString" value="Provider=MSDAORA.1;hostname=xp050;port=1521;User ID=ghtdb;Password=ghtdb;ServiceName=xp050;Data Source=xp050" />
-		<add key="ConnectionString" value="Provider=IBMDADB2;Password=db2admin;User ID=db2admin;Data Source=GHTDB;HostName=xp050;Port=50000;Location=xp050:50000" />
-		<add key="ConnectionString" value="Provider=Sybase ASE OLE DB Provider;hostname=KONGO;port=5000;User ID=sa;Password=;ServiceName=KONGO;Data Source=sybaseoledb;JdbcDriverClassName=com.sybase.jdbc2.jdbc.SybDriver;JdbcURL=jdbc:sybase:Tds:KONGO:5000/GHTDB;user=sa;DatabaseName=GHTDB" />
-		<add key="ConnectionString" value="Provider=Mainsoft.JDBC.OLEDB.1;Persist Security Info=False;User ID=super;Data Source=PostgreSQL_XP050;Extended Properties="DSN=PostgreSQL_XP050;DATABASE=GHTDB;SERVER=xp050;PORT=5432;UID=super;ReadOnly=0;Protocol=6.4;FakeOidIndex=0;ShowOidColumn=0;RowVersioning=0;ShowSystemTables=0;ConnSettings=;Fetch=100;Socket=8192;UnknownSizes=0;MaxVarcharSize=254;MaxLongVarcharSize=8190;Debug=0;CommLog=0;Optimizer=1;Ksqo=1;UseDeclareFetch=0;TextAsLongVarchar=1;UnknownsAsLongVarchar=0;BoolsAsChar=0;Parse=0;CancelAsFreeStmt=0;ExtraSysTablePrefixes=dd_;;LFConversion=1;UpdatableCursors=0;DisallowPremature=0;TrueIsMinus1=0;BI=0;ByteaAsLongVarBinary=0;UseServerSidePrepare=0";Initial Catalog=GHTDB;JdbcDriverClassName=org.postgresql.Driver;JdbcURL=jdbc:postgresql://xp050/GHTDB;User=super;Password=super" />
-		-->
-	</appSettings>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<appSettings>
+		<add key="ConnectionString" value="hostname=powergh;port=1521;User ID=ghtdb;Password=ghtdb;ServiceName=powergh;Data Source=powergh" />
+		<!--
+		<add key="ConnectionString" value="Provider=SQLOLEDB.1;Data Source=xp050;Initial Catalog=GHTDB;User Id=sa;Password=" />
+		<add key="ConnectionString" value="Provider=MSDAORA.1;hostname=xp050;port=1521;User ID=ghtdb;Password=ghtdb;ServiceName=xp050;Data Source=xp050" />
+		<add key="ConnectionString" value="Provider=IBMDADB2;Password=db2admin;User ID=db2admin;Data Source=GHTDB;HostName=xp050;Port=50000;Location=xp050:50000" />
+		<add key="ConnectionString" value="Provider=Sybase ASE OLE DB Provider;hostname=KONGO;port=5000;User ID=sa;Password=;ServiceName=KONGO;Data Source=sybaseoledb;JdbcDriverClassName=com.sybase.jdbc2.jdbc.SybDriver;JdbcURL=jdbc:sybase:Tds:KONGO:5000/GHTDB;user=sa;DatabaseName=GHTDB" />
+		<add key="ConnectionString" value="Provider=Mainsoft.JDBC.OLEDB.1;Persist Security Info=False;User ID=super;Data Source=PostgreSQL_XP050;Extended Properties="DSN=PostgreSQL_XP050;DATABASE=GHTDB;SERVER=xp050;PORT=5432;UID=super;ReadOnly=0;Protocol=6.4;FakeOidIndex=0;ShowOidColumn=0;RowVersioning=0;ShowSystemTables=0;ConnSettings=;Fetch=100;Socket=8192;UnknownSizes=0;MaxVarcharSize=254;MaxLongVarcharSize=8190;Debug=0;CommLog=0;Optimizer=1;Ksqo=1;UseDeclareFetch=0;TextAsLongVarchar=1;UnknownsAsLongVarchar=0;BoolsAsChar=0;Parse=0;CancelAsFreeStmt=0;ExtraSysTablePrefixes=dd_;;LFConversion=1;UpdatableCursors=0;DisallowPremature=0;TrueIsMinus1=0;BI=0;ByteaAsLongVarBinary=0;UseServerSidePrepare=0";Initial Catalog=GHTDB;JdbcDriverClassName=org.postgresql.Driver;JdbcURL=jdbc:postgresql://xp050/GHTDB;User=super;Password=super" />
+		-->
+	</appSettings>
 </configuration>

+ 33 - 33
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.sln

@@ -1,33 +1,33 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient.Tests.J2EE", "System.Data.OracleClient.Tests.J2EE.vmwcsproj", "{8A846229-F249-415F-B69D-738374543437}"
-	ProjectSection(ProjectDependencies) = postProject
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1} = {39CC8FF7-EF1A-41A1-B727-42684211ECD1}
-	EndProjectSection
-EndProject
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug_Java = Debug_Java
-		Release_Java = Release_Java
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{8A846229-F249-415F-B69D-738374543437}.Debug.ActiveCfg = Debug|.NET
-		{8A846229-F249-415F-B69D-738374543437}.Debug.Build.0 = Debug|.NET
-		{8A846229-F249-415F-B69D-738374543437}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{8A846229-F249-415F-B69D-738374543437}.Debug_Java.Build.0 = Debug_Java|.NET
-		{8A846229-F249-415F-B69D-738374543437}.Release_Java.ActiveCfg = Release_Java|.NET
-		{8A846229-F249-415F-B69D-738374543437}.Release_Java.Build.0 = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
-		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient.Tests.J2EE", "System.Data.OracleClient.Tests.J2EE.vmwcsproj", "{8A846229-F249-415F-B69D-738374543437}"
+	ProjectSection(ProjectDependencies) = postProject
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1} = {39CC8FF7-EF1A-41A1-B727-42684211ECD1}
+	EndProjectSection
+EndProject
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Debug_Java = Debug_Java
+		Release_Java = Release_Java
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{8A846229-F249-415F-B69D-738374543437}.Debug.ActiveCfg = Debug|.NET
+		{8A846229-F249-415F-B69D-738374543437}.Debug.Build.0 = Debug|.NET
+		{8A846229-F249-415F-B69D-738374543437}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{8A846229-F249-415F-B69D-738374543437}.Debug_Java.Build.0 = Debug_Java|.NET
+		{8A846229-F249-415F-B69D-738374543437}.Release_Java.ActiveCfg = Release_Java|.NET
+		{8A846229-F249-415F-B69D-738374543437}.Release_Java.Build.0 = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

+ 137 - 137
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests.J2EE.vmwcsproj

@@ -1,137 +1,137 @@
-<VisualStudioProject>
-	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{8A846229-F249-415F-B69D-738374543437}">
-		<Build>
-			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.Data.OracleClient.Tests.J2EE" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.Data.OracleClient.Tests.J2EE" RunPostBuildEvent="OnBuildSuccess" StartupObject="">
-				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
-				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
-				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="..\..\..\nunit20\nunit-console\bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>
-			</Settings>
-			<References>
-				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
-				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>
-				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>
-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>
-				<Reference Name="System.Data.OracleClient" AssemblyName="System.Data.OracleClient" HintPath="..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.OracleClient.dll"/>
-				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}" Private="False"/>
-			</References>
-		</Build>
-		<Files>
-			<Include>
-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Open.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" SubType="Code" BuildAction="Compile"/>
-				<File RelPath="System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" SubType="Code" BuildAction="Compile"/>
-			</Include>
-		</Files>
-		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.data.oracleclient="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.OracleClient.jar" REFS.JarPath.system="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar"/>
-	</CSHARP>
-	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\cygwin1\monobuild1\mcs\nunit20\nunit-console\bin\Debug_Java\nunit-console.exe" Prop2007="" Prop2008="" Prop2009="/wait /exclude=NotWorking System.Data.OracleClient.Tests.J2EE.dll" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>
+<VisualStudioProject>
+	<CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{8A846229-F249-415F-B69D-738374543437}">
+		<Build>
+			<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.Data.OracleClient.Tests.J2EE" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.Data.OracleClient.Tests.J2EE" RunPostBuildEvent="OnBuildSuccess" StartupObject="">
+				<Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
+				<Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TRACE;JAVA;TARGET_JVM" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
+				<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="JAVA" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="..\..\..\nunit20\nunit-console\bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>
+			</Settings>
+			<References>
+				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
+				<Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>
+				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>
+				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>
+				<Reference Name="System.Data.OracleClient" AssemblyName="System.Data.OracleClient" HintPath="..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.OracleClient.dll"/>
+				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}" Private="False"/>
+			</References>
+		</Build>
+		<Files>
+			<Include>
+				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Open.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" SubType="Code" BuildAction="Compile"/>
+				<File RelPath="System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" SubType="Code" BuildAction="Compile"/>
+			</Include>
+		</Files>
+		<UserProperties project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jre5\lib\rt.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.data.oracleclient="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.OracleClient.jar" REFS.JarPath.system="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar"/>
+	</CSHARP>
+	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="1" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\cygwin1\monobuild1\mcs\nunit20\nunit-console\bin\Debug_Java\nunit-console.exe" Prop2007="" Prop2008="" Prop2009="/wait /exclude=NotWorking System.Data.OracleClient.Tests.J2EE.dll" Prop2010="" Prop2011="0" Prop2012="-1" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

+ 26 - 26
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.sln

@@ -1,26 +1,26 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient.Tests20.J2EE", "System.Data.OracleClient.Tests20.J2EE.vmwcsproj", "{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_Java|Any CPU = Debug_Java|Any CPU
-		Debug_Java20|Any CPU = Debug_Java20|Any CPU
-		Release_Java|Any CPU = Release_Java|Any CPU
-		Release_Java20|Any CPU = Release_Java20|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java|Any CPU.ActiveCfg = Release_Java20|Any CPU
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java|Any CPU.Build.0 = Release_Java20|Any CPU
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
-		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Data.OracleClient.Tests20.J2EE", "System.Data.OracleClient.Tests20.J2EE.vmwcsproj", "{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Java|Any CPU = Debug_Java|Any CPU
+		Debug_Java20|Any CPU = Debug_Java20|Any CPU
+		Release_Java|Any CPU = Release_Java|Any CPU
+		Release_Java20|Any CPU = Release_Java20|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java|Any CPU.Build.0 = Release_Java20|Any CPU
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java20|Any CPU.ActiveCfg = Release_Java20|Any CPU
+		{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}.Release_Java20|Any CPU.Build.0 = Release_Java20|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

+ 229 - 229
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.vmwcsproj

@@ -1,230 +1,230 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
-    <OutputPath>bin\Release_Java20\</OutputPath>
-    <DefineConstants>TRACE;TARGET_JVM;JAVA</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <GHProjectType>1</GHProjectType>
-    <PreCompile>false</PreCompile>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <ApplicationServerType>
-    </ApplicationServerType>
-    <Version>2.0</Version>
-    <JDKName>1.5.0_05</JDKName>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug_Java20\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TARGET_JVM;JAVA</DefineConstants>
-    <BaseAddress>285212672</BaseAddress>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <SkipValidation>True</SkipValidation>
-    <KeepIntermediate>False</KeepIntermediate>
-    <GHProjectType>1</GHProjectType>
-    <PreCompile>false</PreCompile>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-    <ApplicationServerType>
-    </ApplicationServerType>
-    <Version>2.0</Version>
-    <JDKName>1.5.0_05</JDKName>
-    <TargetPlatform>0</TargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>System.Data.OracleClient.Tests20.J2EE</RootNamespace>
-    <AssemblyName>System.Data.OracleClient.Tests20.J2EE</AssemblyName>
-    <JDKName>1.5.0_05</JDKName>
-    <GHProjectType>1</GHProjectType>
-    <Version>2.0</Version>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug_Java\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TARGET_JVM;JAVA</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>285212672</BaseAddress>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release_Java\</OutputPath>
-    <DefineConstants>TRACE;TARGET_JVM;JAVA</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <BaseAddress>285212672</BaseAddress>
-    <SkipValidation>false</SkipValidation>
-    <KeepIntermediate>false</KeepIntermediate>
-    <TargetPlatform>0</TargetPlatform>
-    <AdditionalClassPath>
-    </AdditionalClassPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Open.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" />
-    <Compile Include="System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="rt, Version=0.0.0.0, Culture=neutral">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.OracleClient">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
-  <Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties REFS-JarPath-rt="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar" REFS-JarPath-system-data="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar" REFS-JarPath-system="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-mscorlib="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-system-data-oracleclient="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.OracleClient.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" />
-    </VisualStudio>
-  </ProjectExtensions>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
+    <OutputPath>bin\Release_Java20\</OutputPath>
+    <DefineConstants>TRACE;TARGET_JVM;JAVA</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <SkipValidation>false</SkipValidation>
+    <KeepIntermediate>false</KeepIntermediate>
+    <GHProjectType>1</GHProjectType>
+    <PreCompile>false</PreCompile>
+    <AdditionalClassPath>
+    </AdditionalClassPath>
+    <ApplicationServerType>
+    </ApplicationServerType>
+    <Version>2.0</Version>
+    <JDKName>1.5.0_05</JDKName>
+    <TargetPlatform>0</TargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug_Java20\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TARGET_JVM;JAVA</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <SkipValidation>True</SkipValidation>
+    <KeepIntermediate>False</KeepIntermediate>
+    <GHProjectType>1</GHProjectType>
+    <PreCompile>false</PreCompile>
+    <AdditionalClassPath>
+    </AdditionalClassPath>
+    <ApplicationServerType>
+    </ApplicationServerType>
+    <Version>2.0</Version>
+    <JDKName>1.5.0_05</JDKName>
+    <TargetPlatform>0</TargetPlatform>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DC2FDC0D-C2C3-4B2B-84F0-6655BD3D1E61}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>System.Data.OracleClient.Tests20.J2EE</RootNamespace>
+    <AssemblyName>System.Data.OracleClient.Tests20.J2EE</AssemblyName>
+    <JDKName>1.5.0_05</JDKName>
+    <GHProjectType>1</GHProjectType>
+    <Version>2.0</Version>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug_Java\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;TARGET_JVM;JAVA</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <BaseAddress>285212672</BaseAddress>
+    <SkipValidation>false</SkipValidation>
+    <KeepIntermediate>false</KeepIntermediate>
+    <TargetPlatform>0</TargetPlatform>
+    <AdditionalClassPath>
+    </AdditionalClassPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release_Java\</OutputPath>
+    <DefineConstants>TRACE;TARGET_JVM;JAVA</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <BaseAddress>285212672</BaseAddress>
+    <SkipValidation>false</SkipValidation>
+    <KeepIntermediate>false</KeepIntermediate>
+    <TargetPlatform>0</TargetPlatform>
+    <AdditionalClassPath>
+    </AdditionalClassPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ADONetTesterClass.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\ConnectedDataProvider.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParameter.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\DbTypeParametersCollection.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\MonoTests.System.Data.Utils\GHTBase.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommandBuilder\OracleCommandBuilder_DeriveParameters_O.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandText.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandTimeout.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_CommandType.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Connection.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Dispose.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteNonQuery.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteReader.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_ExecuteScalar.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_New.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Parameters.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Prepare.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleCommand\OracleCommand_Transaction.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\IDBConnection_For_Oracle.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_BeginTransaction.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ChangeDatabase.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Close.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionString.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_ConnectionTimeout.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_CreateCommand.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Database.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_DataSource.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Equals.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_InfoMessage.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_New.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_Open.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_State.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleConnection\OracleConnection_StateChange.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_AcceptChangesDuringFill.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ContinueUpdateOnError.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_O.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SO.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ctor_SS.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_DeleteCommand.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Dispose.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillError.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DS.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DSS.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DsSt.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_FillSchema_DtSch.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_1.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_2.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_3.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_DsStr.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Ds_Int_Int_Str.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Fill_Dt.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_GetFillParameters.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_InsertCommand.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingMappingAction.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_MissingSchemaAction.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdated.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_RowUpdating.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_SelectCommand.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_TableMappings.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_ToString.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_UpdateCommand.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dr.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Ds.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_DsStr.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataAdapter\OracleDataAdapter_Update_Dt.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Close.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_ctor.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Depth.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBoolean.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetBytes_IIBII.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetByte_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetChars.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDataTypeName.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDateTime.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDecimal_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetDouble_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFieldType.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetFloat_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetGuiid_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt16.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt32_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetInt64.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetName_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetOrdinal.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetSchemaTable.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetString_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetTimeSpan_I.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValue.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_GetValues.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_HasRows.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_IsDBNull.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Item.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_NextResult.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_Read.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleDataReader\OracleDataReader_RecordsAffected.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Add.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Contains.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameterCollection\OracleParameterCollection_Count.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SO.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOIPBBBSDO.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtypeI.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleParameter\OracleParameter_ctor_SOtype_IS.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Begin.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Commit.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Connection.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_ctor.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_IsolationLevel.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleTransaction\OracleTransaction_Rollback.cs" />
+    <Compile Include="System.Data.OracleClient.jvm\OracleType\OracleType_Date.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="rt, Version=0.0.0.0, Culture=neutral">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.OracleClient">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
+  <Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties REFS-JarPath-rt="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar" REFS-JarPath-system-data="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar" REFS-JarPath-system="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-mscorlib="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-system-data-oracleclient="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.OracleClient.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>

+ 2 - 2
mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.jvm/OracleCommand/ChangeLog

@@ -1,3 +1,3 @@
-2006-02-26  Konstantin Triger <[email protected]>
-
+2006-02-26  Konstantin Triger <[email protected]>
+
         * OracleCommand_CommandType.cs: Port OleDb invocation style to that of OracleClient.

+ 20 - 20
mcs/class/System.Data.OracleClient/run-tests.bat

@@ -1,20 +1,20 @@
-@echo off
-REM ********************************************************
-REM This batch call all the test batches with default parameters
-REM ********************************************************
-REM ********************************************************
-REM This batch file receives the follwing parameters:
-REM build/rebuild (optional): should the solution file be rebuilded 
-REM                             or just builded before test run (default is rebuild)
-REM ********************************************************
-
-IF "%1"=="" (
-	set BUILD_OPTION=rebuild
-) ELSE (
-	set BUILD_OPTION=%1
-)
-	
-
-call run-tests.test.bat %BUILD_OPTION%
-
-
+@echo off
+REM ********************************************************
+REM This batch call all the test batches with default parameters
+REM ********************************************************
+REM ********************************************************
+REM This batch file receives the follwing parameters:
+REM build/rebuild (optional): should the solution file be rebuilded 
+REM                             or just builded before test run (default is rebuild)
+REM ********************************************************
+
+IF "%1"=="" (
+	set BUILD_OPTION=rebuild
+) ELSE (
+	set BUILD_OPTION=%1
+)
+	
+
+call run-tests.test.bat %BUILD_OPTION%
+
+

+ 188 - 188
mcs/class/System.Data.OracleClient/run-tests.test.bat

@@ -1,188 +1,188 @@
-@echo off
-REM ********************************************************
-REM This batch file receives the follwing parameters:
-REM build/rebuild (optional): should the solution file be rebuilded 
-REM                             or just builded before test run (default is rebuild)
-REM output files name prefix (mandratory) : prefix for naming output xml files
-REM test fixture name (optional) : if you want to run some particular test fixture
-REM directory to run tests (optional)
-REM path back to root directory (opposite to previous param)
-REM example run-tests build GhTests Test.Sys.Drawing Test\DrawingTest\Test ..\..\..\
-REM will cause to build (and not rebuild) test solutions,
-REM running Test.Sys.Drawing fixture in directory Test\DrawingTest\Test
-REM with output files named GhTests.Net.xml and GhTests.GH.xml
-REM ********************************************************
-
-IF "%1"=="" GOTO USAGE
-
-IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
-
-
-
-IF "%1"=="" (
-	set BUILD_OPTION=rebuild
-) ELSE (
-	set BUILD_OPTION=%1
-)
-
-REM ********************************************************
-REM Set parameters
-REM ********************************************************
-
-set BUILD_OPTION=%1
-set OUTPUT_FILE_PREFIX=System_Data_OracleClient
-set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient
-set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln
-set TEST_ASSEMBLY=System.Data.OracleClient.Tests20.J2EE.jar
-set PROJECT_CONFIGURATION=Debug_Java20
-set APP_CONFIG_FILE=Test\System.Data.OracleClient.J2EE.config
-
-
-set startDate=%date%
-set startTime=%time%
-set sdy=%startDate:~10%
-set /a sdm=1%startDate:~4,2% - 100
-set /a sdd=1%startDate:~7,2% - 100
-set /a sth=%startTime:~0,2%
-set /a stm=1%startTime:~3,2% - 100
-set /a sts=1%startTime:~6,2% - 100
-set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%
-
-
-REM ********************************************************
-REM @echo Set environment
-REM ********************************************************
-
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
-set JAVA_HOME=%VMW_HOME%\jre5
-
-set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.OracleClient.jar
-
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\ojdbc14.jar
-
-set NUNIT_OPTIONS=/exclude=NotWorking
-
-if "%GH_VERSION%"=="" (
-	set GH_VERSION=0_0_0_0
-)
-
-set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%
-set GH_OUTPUT_XML=%COMMON_PREFIX%.xml
-set BUILD_LOG=%COMMON_PREFIX%.build.log
-set RUN_LOG=%COMMON_PREFIX%.run.log
-
-set NUNIT_PATH=..\..\nunit20\
-set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.
-set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%
-
-set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
-
-REM ********************************************************
-@echo Building GH solution...
-REM ********************************************************
-
-REM devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
-
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-
-REM ********************************************************
-@echo Building NUnit solution...
-REM ********************************************************
-
-if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
-
-REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
-
-goto NUNITREADY
-
-:NUNITSKIP
-echo Skipping NUnit Build...
-
-:NUNITREADY
-set NUNIT_BUILD=DONE
-
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-
-REM ********************************************************
-@echo Running GH tests...
-REM ********************************************************
-
-REM ********************************************************
-@echo Running fixture "%RUNNING_FIXTURE%"
-REM ********************************************************
-
-copy Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
-copy %APP_CONFIG_FILE% nunit-console.exe.config
-
-REM @echo on
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
-REM @echo off
-
-REM ********************************************************
-@echo Build XmlTool
-REM ********************************************************
-set XML_TOOL_PATH=..\..\tools\mono-xmltool
-
-if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
-
-REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
-
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-
-goto XMLTOOLREADY
-
-:XMLTOOLSKIP
-echo Skipping XmlToll build...
-
-:XMLTOOLREADY
-set XMLTOOL_BUILD=DONE
-
-copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
-copy %XML_TOOL_PATH%\nunit_transform.xslt .
-
-REM ********************************************************
-@echo Analyze and print results
-REM ********************************************************
-@echo on
-xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
-@echo off
-
-:FINALLY
-GOTO END
-
-:ENVIRONMENT_EXCEPTION
-@echo This test requires environment variable VMW_HOME to be defined
-GOTO END
-
-:BUILD_EXCEPTION
-@echo Error in building solutions. See %BUILD_LOG% for details...
-REM EXIT 1
-GOTO END
-
-:RUN_EXCEPTION
-@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...
-REM EXIT 1
-GOTO END
-
-:USAGE
-@echo Parameters: "[build|rebuild]"
-GOTO END
-
-:END
-copy %RUN_LOG% ..\
-copy %BUILD_LOG% ..\
-copy %GH_OUTPUT_XML% ..\
-
-REM EXIT 0
+@echo off
+REM ********************************************************
+REM This batch file receives the follwing parameters:
+REM build/rebuild (optional): should the solution file be rebuilded 
+REM                             or just builded before test run (default is rebuild)
+REM output files name prefix (mandratory) : prefix for naming output xml files
+REM test fixture name (optional) : if you want to run some particular test fixture
+REM directory to run tests (optional)
+REM path back to root directory (opposite to previous param)
+REM example run-tests build GhTests Test.Sys.Drawing Test\DrawingTest\Test ..\..\..\
+REM will cause to build (and not rebuild) test solutions,
+REM running Test.Sys.Drawing fixture in directory Test\DrawingTest\Test
+REM with output files named GhTests.Net.xml and GhTests.GH.xml
+REM ********************************************************
+
+IF "%1"=="" GOTO USAGE
+
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+
+
+
+IF "%1"=="" (
+	set BUILD_OPTION=rebuild
+) ELSE (
+	set BUILD_OPTION=%1
+)
+
+REM ********************************************************
+REM Set parameters
+REM ********************************************************
+
+set BUILD_OPTION=%1
+set OUTPUT_FILE_PREFIX=System_Data_OracleClient
+set RUNNING_FIXTURE=MonoTests.System.Data.OracleClient
+set TEST_SOLUTION=Test\System.Data.OracleClient.Tests20.J2EE.sln
+set TEST_ASSEMBLY=System.Data.OracleClient.Tests20.J2EE.jar
+set PROJECT_CONFIGURATION=Debug_Java20
+set APP_CONFIG_FILE=Test\System.Data.OracleClient.J2EE.config
+
+
+set startDate=%date%
+set startTime=%time%
+set sdy=%startDate:~10%
+set /a sdm=1%startDate:~4,2% - 100
+set /a sdd=1%startDate:~7,2% - 100
+set /a sth=%startTime:~0,2%
+set /a stm=1%startTime:~3,2% - 100
+set /a sts=1%startTime:~6,2% - 100
+set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%
+
+
+REM ********************************************************
+REM @echo Set environment
+REM ********************************************************
+
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JAVA_HOME=%VMW_HOME%\jre5
+
+set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Data.OracleClient.jar
+
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\ojdbc14.jar
+
+set NUNIT_OPTIONS=/exclude=NotWorking
+
+if "%GH_VERSION%"=="" (
+	set GH_VERSION=0_0_0_0
+)
+
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml
+set BUILD_LOG=%COMMON_PREFIX%.build.log
+set RUN_LOG=%COMMON_PREFIX%.run.log
+
+set NUNIT_PATH=..\..\nunit20\
+set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%
+
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
+
+REM ********************************************************
+@echo Building GH solution...
+REM ********************************************************
+
+REM devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+REM ********************************************************
+@echo Building NUnit solution...
+REM ********************************************************
+
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
+
+REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+goto NUNITREADY
+
+:NUNITSKIP
+echo Skipping NUnit Build...
+
+:NUNITREADY
+set NUNIT_BUILD=DONE
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+REM ********************************************************
+@echo Running GH tests...
+REM ********************************************************
+
+REM ********************************************************
+@echo Running fixture "%RUNNING_FIXTURE%"
+REM ********************************************************
+
+copy Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
+copy %APP_CONFIG_FILE% nunit-console.exe.config
+
+REM @echo on
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
+REM @echo off
+
+REM ********************************************************
+@echo Build XmlTool
+REM ********************************************************
+set XML_TOOL_PATH=..\..\tools\mono-xmltool
+
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
+
+REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+goto XMLTOOLREADY
+
+:XMLTOOLSKIP
+echo Skipping XmlToll build...
+
+:XMLTOOLREADY
+set XMLTOOL_BUILD=DONE
+
+copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
+copy %XML_TOOL_PATH%\nunit_transform.xslt .
+
+REM ********************************************************
+@echo Analyze and print results
+REM ********************************************************
+@echo on
+xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
+@echo off
+
+:FINALLY
+GOTO END
+
+:ENVIRONMENT_EXCEPTION
+@echo This test requires environment variable VMW_HOME to be defined
+GOTO END
+
+:BUILD_EXCEPTION
+@echo Error in building solutions. See %BUILD_LOG% for details...
+REM EXIT 1
+GOTO END
+
+:RUN_EXCEPTION
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...
+REM EXIT 1
+GOTO END
+
+:USAGE
+@echo Parameters: "[build|rebuild]"
+GOTO END
+
+:END
+copy %RUN_LOG% ..\
+copy %BUILD_LOG% ..\
+copy %GH_OUTPUT_XML% ..\
+
+REM EXIT 0