From: Noam Lampert Date: Wed, 14 Mar 2007 17:38:59 +0000 (-0000) Subject: rename jgac/vmw4j2ee_110 to jcag/framework X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=49a408d55ac92bc3261e531cf4d5e4f9b4064ba5;p=mono.git rename jgac/vmw4j2ee_110 to jcag/framework svn path=/trunk/mcs/; revision=74287 --- diff --git a/mcs/class/System.XML/System.Xml20.csproj b/mcs/class/System.XML/System.Xml20.csproj index a62f6ea96dd..e576f535352 100755 --- a/mcs/class/System.XML/System.Xml20.csproj +++ b/mcs/class/System.XML/System.Xml20.csproj @@ -548,7 +548,7 @@ --> - + diff --git a/mcs/class/System.XML/Test/System.Xml.Test20.csproj b/mcs/class/System.XML/Test/System.Xml.Test20.csproj index 12cd270bc72..ce1208e9cd9 100755 --- a/mcs/class/System.XML/Test/System.Xml.Test20.csproj +++ b/mcs/class/System.XML/Test/System.Xml.Test20.csproj @@ -158,7 +158,7 @@ - + {ACDA29DB-62AB-4AF8-8862-B3B4FC755BBC} nunit.framework.dll20.J2EE @@ -177,7 +177,7 @@ --> - + - \ No newline at end of file + diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat index 770972b15d6..e4a357571ae 100755 --- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat +++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/run-test.j2ee.bat @@ -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 + diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj index 3dafb86a7e5..e6bcac053e4 100644 --- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj +++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt20.J2EE.csproj @@ -78,7 +78,7 @@ --> - + diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj index 1ac22927842..6af237bef28 100644 --- a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj +++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.J2EE.csproj @@ -59,7 +59,7 @@ --> - + diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj index 619b1ab6e71..ebeca8cf4ee 100644 --- a/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj +++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C20.J2EE.csproj @@ -78,7 +78,7 @@ --> - + diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat b/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat index c4ceff26bf2..2a2e46c5a05 100644 --- a/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat +++ b/mcs/class/System.XML/Test/System.Xml/W3C/run-test.j2ee.bat @@ -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 diff --git a/mcs/class/System.XML/run-W3C-tests.bat b/mcs/class/System.XML/run-W3C-tests.bat index 1f00828a7d3..abb368628a7 100644 --- a/mcs/class/System.XML/run-W3C-tests.bat +++ b/mcs/class/System.XML/run-W3C-tests.bat @@ -46,7 +46,7 @@ REM ******************************************************** 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 @@ set XML_TOOL_PATH=..\..\tools\mono-xmltool 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 diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat index 2e4588c977b..ba50ee9aaff 100644 --- a/mcs/class/System.XML/run-XSLT-tests.bat +++ b/mcs/class/System.XML/run-XSLT-tests.bat @@ -46,7 +46,7 @@ REM ******************************************************** 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 @@ set XML_TOOL_PATH=..\..\tools\mono-xmltool 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 diff --git a/mcs/class/System.XML/run-tests.api.bat b/mcs/class/System.XML/run-tests.api.bat index b807d5310ca..12139254811 100755 --- a/mcs/class/System.XML/run-tests.api.bat +++ b/mcs/class/System.XML/run-tests.api.bat @@ -51,7 +51,7 @@ REM ******************************************************** 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