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 a62f6ea96dd26202a4a84c544fb3f0d62c8bb910..e576f5353523c33609b0a7a81eed63da1687b347 100755 (executable)
--- a/mcs/class/System.XML/System.Xml20.csproj
+++ b/mcs/class/System.XML/System.Xml20.csproj
@@ -548,7 +548,7 @@
   -->\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <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" />\r
+      <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" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
   <PropertyGroup>\r

diff --git a/mcs/class/System.XML/Test/System.Xml.Test20.csproj b/mcs/class/System.XML/Test/System.Xml.Test20.csproj
index 12cd270bc72e9fb967df6e6ac500a68f84226692..ce1208e9cd9717efff8bb8c1b78be20fb8dcbf02 100755 (executable)
--- a/mcs/class/System.XML/Test/System.Xml.Test20.csproj
+++ b/mcs/class/System.XML/Test/System.Xml.Test20.csproj
@@ -158,7 +158,7 @@
     <Compile Include="System.Xml\XsdValidatingReaderTests.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\..\..\nunit20\framework\nunit.framework.dll20.J2EE.vmwcsproj">\r
+    <ProjectReference Include="..\..\..\nunit20\framework\nunit.framework.dll20.J2EE.csproj">\r
       <Project>{ACDA29DB-62AB-4AF8-8862-B3B4FC755BBC}</Project>\r
       <Name>nunit.framework.dll20.J2EE</Name>\r
     </ProjectReference>\r
@@ -177,7 +177,7 @@
   -->\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <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" />\r
+      <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" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
-</Project>
\ No newline at end of file
+</Project>\r

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 770972b15d663fc0db58543f1547d9065dd15871..e4a357571ae052aab64b6774a65a5418c4f0e130 100755 (executable)
--- 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\\r
+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\r
+\r

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 3dafb86a7e5add261945721b0723f26bf0693ad5..e6bcac053e4d6e82f8df79dfbb31993b314dec43 100644 (file)
--- 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 @@
   -->\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <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" />\r
+      <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" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
   <ItemGroup>\r

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 1ac22927842b7689db0a039370f8186b68666d09..6af237bef280ca3e8c72c00347517eb5af5044d7 100644 (file)
--- 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 @@
   -->\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <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" />\r
+      <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" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
   <ItemGroup>\r

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 619b1ab6e71d5f0d7769fb5312e9812e9655e90f..ebeca8cf4ee3984371cbd7208c9f8ae2e85cfaca 100644 (file)
--- 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 @@
   -->\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <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" />\r
+      <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" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
   <ItemGroup>\r

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 c4ceff26bf2cad75b28f102a6c7c648dc7f5f963..2a2e46c5a059fb714c147c98f4252d99f675cd3a 100644 (file)
--- 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\\r
+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\r

diff --git a/mcs/class/System.XML/run-W3C-tests.bat b/mcs/class/System.XML/run-W3C-tests.bat
index 1f00828a7d3ab01c8d0212d0f9c7164c96362f61..abb368628a7601e60ba546aff0487984449ab708 100644 (file)
--- 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\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\framework\\r
 set JAVA_HOME=%VMW_HOME%\jre5\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
@@ -140,7 +140,7 @@ set XML_TOOL_PATH=..\..\tools\mono-xmltool
 \r
 if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP\r
 \r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r

diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat
index 2e4588c977bc2dce9e9b6b8c34a23de9860876ac..ba50ee9aaff154812a4a884404986f91272b2732 100644 (file)
--- 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\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\framework\\r
 set JAVA_HOME=%VMW_HOME%\jre5\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
@@ -148,7 +148,7 @@ set XML_TOOL_PATH=..\..\tools\mono-xmltool
 \r
 if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP\r
 \r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r

diff --git a/mcs/class/System.XML/run-tests.api.bat b/mcs/class/System.XML/run-tests.api.bat
index b807d5310ca7a78ebfb7aa7304556cd396320cc0..121392548117e2c26716c850f16208d889239947 100755 (executable)
--- 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\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\jgac\framework\\r
 set JAVA_HOME=%VMW_HOME%\jre5\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r