Author: noaml
Date: 2007-03-14 12:38:59 -0500 (Wed, 14 Mar 2007)
New Revision: 74287
Modified:
trunk/mcs/class/System.XML/System.Xml20.csproj
trunk/mcs/class/System.XML/Test/System.Xml.Test20.csproj
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj
trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj
trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj
trunk/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat
trunk/mcs/class/System.XML/run-W3C-tests.bat
trunk/mcs/class/System.XML/run-XSLT-tests.bat
trunk/mcs/class/System.XML/run-tests.api.bat
Log:
rename jgac/vmw4j2ee_110 to jcag/framework
Modified: trunk/mcs/class/System.XML/System.Xml20.csproj
===================================================================
--- trunk/mcs/class/System.XML/System.Xml20.csproj 2007-03-14 17:38:01 UTC
(rev 74286)
+++ trunk/mcs/class/System.XML/System.Xml20.csproj 2007-03-14 17:38:59 UTC
(rev 74287)
@@ -548,7 +548,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties 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" />
+ <UserProperties 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" />
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
Modified: trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj
2007-03-14 17:38:01 UTC (rev 74286)
+++ trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj
2007-03-14 17:38:59 UTC (rev 74287)
@@ -59,7 +59,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.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-system-xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE
2\jre5\lib\rt.jar" />
+ <UserProperties
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.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-system-xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\framework\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE
2\jre5\lib\rt.jar" />
</VisualStudio>
</ProjectExtensions>
<ItemGroup>
Modified: trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj
2007-03-14 17:38:01 UTC (rev 74286)
+++ trunk/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj
2007-03-14 17:38:59 UTC (rev 74287)
@@ -78,7 +78,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.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-rt="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.core.jar"
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar"
/>
+ <UserProperties REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jgac\framework\System.Xml.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-rt="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.core.jar"
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar"
/>
</VisualStudio>
</ProjectExtensions>
<ItemGroup>
Modified: trunk/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat
2007-03-14 17:38:01 UTC (rev 74286)
+++ trunk/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat
2007-03-14 17:38:59 UTC (rev 74287)
@@ -1,2 +1,2 @@
-set JGAC_PATH=c:\Program Files\Mainsoft\Visual MainWin for
J2EE\jgac\vmw4j2ee_110\
-java -cp
"%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%nunit.core.jar;%JGAC_PATH%nunit.framework.jar;%JGAC_PATH%nunit.util.jar;%JGAC_PATH%J2SE.Helpers.jar;W3C.jar;nunit-console.jar"
NUnit.Console.ConsoleUi /fixture=MonoTests.W3C_xmlconf.CleanTests W3C.jar
/xml=TestsResult.xml
+set JGAC_PATH=c:\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\framework\
+java -cp
"%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%nunit.core.jar;%JGAC_PATH%nunit.framework.jar;%JGAC_PATH%nunit.util.jar;%JGAC_PATH%J2SE.Helpers.jar;W3C.jar;nunit-console.jar"
NUnit.Console.ConsoleUi /fixture=MonoTests.W3C_xmlconf.CleanTests W3C.jar
/xml=TestsResult.xml
Modified: trunk/mcs/class/System.XML/Test/System.Xml.Test20.csproj
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml.Test20.csproj 2007-03-14
17:38:01 UTC (rev 74286)
+++ trunk/mcs/class/System.XML/Test/System.Xml.Test20.csproj 2007-03-14
17:38:59 UTC (rev 74287)
@@ -158,7 +158,7 @@
<Compile Include="System.Xml\XsdValidatingReaderTests.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference
Include="..\..\..\nunit20\framework\nunit.framework.dll20.J2EE.vmwcsproj">
+ <ProjectReference
Include="..\..\..\nunit20\framework\nunit.framework.dll20.J2EE.csproj">
<Project>{ACDA29DB-62AB-4AF8-8862-B3B4FC755BBC}</Project>
<Name>nunit.framework.dll20.J2EE</Name>
</ProjectReference>
@@ -177,7 +177,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties REFS-JarPath-mscorlib="..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Data.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jre5\lib\rt.jar" />
+ <UserProperties REFS-JarPath-mscorlib="..\..\..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\framework\mscorlib.jar"
REFS-JarPath-system="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\framework\System.jar"
REFS-JarPath-system-data="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\framework\System.Data.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\framework\System.Xml.jar"
REFS-JarPath-rt="..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jre5\lib\rt.jar" />
</VisualStudio>
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
Modified:
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat
===================================================================
---
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat
2007-03-14 17:38:01 UTC (rev 74286)
+++
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat
2007-03-14 17:38:59 UTC (rev 74287)
@@ -1,3 +1,3 @@
-set JGAC_PATH=c:\Program Files\Mainsoft\Visual MainWin for
J2EE\jgac\vmw4j2ee_110\
-java -cp
"%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%nunit.core.jar;%JGAC_PATH%nunit.framework.jar;%JGAC_PATH%nunit.util.jar;%JGAC_PATH%J2SE.Helpers.jar;xslt.jar;nunit-console.jar"
NUnit.Console.ConsoleUi xslt.jar /fixture:MonoTests.oasis_xslt.SuiteBuilder
/xml=TestResult.xml /include=KnownFailures
-
+set JGAC_PATH=c:\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\framework\
+java -cp
"%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%nunit.core.jar;%JGAC_PATH%nunit.framework.jar;%JGAC_PATH%nunit.util.jar;%JGAC_PATH%J2SE.Helpers.jar;xslt.jar;nunit-console.jar"
NUnit.Console.ConsoleUi xslt.jar /fixture:MonoTests.oasis_xslt.SuiteBuilder
/xml=TestResult.xml /include=KnownFailures
+
Modified:
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj
===================================================================
---
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj
2007-03-14 17:38:01 UTC (rev 74286)
+++
trunk/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj
2007-03-14 17:38:59 UTC (rev 74287)
@@ -78,7 +78,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Xml.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-rt="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" />
+ <UserProperties
REFS-JarPath-nunit-framework="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.jar"
REFS-JarPath-nunit-core="..\..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.jar"
REFS-JarPath-system-xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE 2\jgac\framework\System.Xml.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-rt="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar" />
</VisualStudio>
</ProjectExtensions>
<ItemGroup>
Modified: trunk/mcs/class/System.XML/run-W3C-tests.bat
===================================================================
--- trunk/mcs/class/System.XML/run-W3C-tests.bat 2007-03-14 17:38:01 UTC
(rev 74286)
+++ trunk/mcs/class/System.XML/run-W3C-tests.bat 2007-03-14 17:38:59 UTC
(rev 74287)
@@ -46,7 +46,7 @@
REM @echo Set environment
REM ********************************************************
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JGAC_PATH=%VMW_HOME%\jgac\framework\
set JAVA_HOME=%VMW_HOME%\jre5
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
@@ -140,7 +140,7 @@
if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
Modified: trunk/mcs/class/System.XML/run-XSLT-tests.bat
===================================================================
--- trunk/mcs/class/System.XML/run-XSLT-tests.bat 2007-03-14 17:38:01 UTC
(rev 74286)
+++ trunk/mcs/class/System.XML/run-XSLT-tests.bat 2007-03-14 17:38:59 UTC
(rev 74287)
@@ -46,7 +46,7 @@
REM @echo Set environment
REM ********************************************************
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JGAC_PATH=%VMW_HOME%\jgac\framework\
set JAVA_HOME=%VMW_HOME%\jre5
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
@@ -148,7 +148,7 @@
if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION%
/p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
Modified: trunk/mcs/class/System.XML/run-tests.api.bat
===================================================================
--- trunk/mcs/class/System.XML/run-tests.api.bat 2007-03-14 17:38:01 UTC
(rev 74286)
+++ trunk/mcs/class/System.XML/run-tests.api.bat 2007-03-14 17:38:59 UTC
(rev 74287)
@@ -51,7 +51,7 @@
REM @echo Set environment
REM ********************************************************
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+set JGAC_PATH=%VMW_HOME%\jgac\framework\
set JAVA_HOME=%VMW_HOME%\jre5
set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
