Author: noaml
Date: 2007-03-21 16:37:46 -0500 (Wed, 21 Mar 2007)
New Revision: 74770
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj
trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat
Log:
Convert jgac to java_refs, and jre6 to jre
Modified:
trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj
2007-03-21 21:35:11 UTC (rev 74769)
+++ trunk/mcs/class/System.Data.OracleClient/System.Data.OracleClient20.csproj
2007-03-21 21:37:46 UTC (rev 74770)
@@ -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>
Modified:
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj
===================================================================
---
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj
2007-03-21 21:35:11 UTC (rev 74769)
+++
trunk/mcs/class/System.Data.OracleClient/Test/System.Data.OracleClient.Tests20.J2EE.csproj
2007-03-21 21:37:46 UTC (rev 74770)
@@ -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
Modified: trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat
===================================================================
--- trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat 2007-03-21
21:35:11 UTC (rev 74769)
+++ trunk/mcs/class/System.Data.OracleClient/run-tests.test.bat 2007-03-21
21:37:46 UTC (rev 74770)
@@ -53,8 +53,8 @@
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%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
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
