Convert jgac to java_refs, and jre6 to jre

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

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj
index 1f18f68876d75366f32aab7eefeb6262a95b44d8..37accc2deab0281f045f5074e3a3daaaf84def72 100755 (executable)
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj
@@ -97,7 +97,7 @@
   -->
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties REFS-JarPath-system-drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\jai_imageio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\jai_core.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\jai_codec.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\clibwrapper_jiio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\mlibwrapper_jai.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\System.jar" REFS-JarPath-rt="..\lib\rt.jar" />
+      <UserProperties REFS-JarPath-system-drawing="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Drawing.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_imageio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_core.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\jai_codec.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\clibwrapper_jiio.jar;..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mlibwrapper_jai.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mscorlib.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-rt="..\lib\rt.jar" />
     </VisualStudio>
   </ProjectExtensions>
   <ItemGroup>

diff --git a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj
index 669df1fa0ec6e9ef61479352dea6b6910321c2b5..f52fd000ff2a05508cd30f07f3a190c11fe5949e 100644 (file)
--- a/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj
+++ b/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj
@@ -225,7 +225,7 @@
   -->
   <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\framework\System.Xml.jar" REFS-JarPath-system-data="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\System.Data.jar" REFS-JarPath-system="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\System.jar" REFS-JarPath-mscorlib="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\mscorlib.jar" REFS-JarPath-system-data-oracleclient="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\System.Data.OracleClient.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" />
+      <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\java_refs\framework\System.Xml.jar" REFS-JarPath-system-data="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Data.jar" REFS-JarPath-system="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.jar" REFS-JarPath-mscorlib="..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\mscorlib.jar" REFS-JarPath-system-data-oracleclient="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\java_refs\framework\System.Data.OracleClient.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file

diff --git a/mcs/class/System.Data.OracleClient/run-tests.test.bat b/mcs/class/System.Data.OracleClient/run-tests.test.bat
index 067f45241e7f1042c0dd4f5acb365c9ba1d9fff4..20d982c4d929c854a19f2bee51dcf9b89fcbbf69 100644 (file)
--- a/mcs/class/System.Data.OracleClient/run-tests.test.bat
+++ b/mcs/class/System.Data.OracleClient/run-tests.test.bat
@@ -53,8 +53,8 @@ REM ********************************************************
 REM @echo Set environment
 REM ********************************************************
 
-set JGAC_PATH=%VMW_HOME%\jgac\framework\
-set JAVA_HOME=%VMW_HOME%\jre6
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\
+set JAVA_HOME=%VMW_HOME%\jre
 
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
@@ -63,7 +63,7 @@ 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 RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\ojdbc14.jar
 
 set NUNIT_OPTIONS=/exclude=NotWorking