Merged selected applicable changes from prj40_prototype branch. The actual
changes that were merged were prepared on prj40_merge branch.
Also a test in 'ide' module and JavaCvsRuntimeCommand in javacvs module
had to be adjusted.
Related issue #37174.
1.1 --- a/vcscvs/compat/manifest.mf Wed Nov 12 16:40:31 2003 +0000
1.2 +++ b/vcscvs/compat/manifest.mf Wed Nov 12 17:34:57 2003 +0000
1.3 @@ -4,5 +4,5 @@
1.4 OpenIDE-Module-Specification-Version: 1.3
1.5 OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
1.6 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
1.7 -OpenIDE-Module-Module-Dependencies: org.netbeans.modules.vcscore/1, org.netbeans.modules.vcs.advanced/1
1.8 +OpenIDE-Module-Module-Dependencies: org.netbeans.modules.vcscore/1, org.netbeans.modules.vcs.advanced/1 > 1.9
1.9
2.1 --- a/vcscvs/compat/src/org/netbeans/modules/vcs/cmdline/CvsFileSystem.java Wed Nov 12 16:40:31 2003 +0000
2.2 +++ b/vcscvs/compat/src/org/netbeans/modules/vcs/cmdline/CvsFileSystem.java Wed Nov 12 17:34:57 2003 +0000
2.3 @@ -71,17 +71,11 @@
2.4 public CvsFileSystem() {
2.5 }
2.6
2.7 - private static final String CONFIG_CVS_UNIX = "cvsUnix.xml";
2.8 - private static final String CONFIG_CVS_WIN = "cvsWin.xml";
2.9 - private static final String CONFIG_CVS_WIN98 = "cvsWin98.xml";
2.10 + private static final String CONFIG_CVS = "cvs.xml"; // NOI18N
2.11
2.12 private CommandLineVcsFileSystem createCommandLineVcsFileSystem() {
2.13 String configFileName;
2.14 - String os = System.getProperty("os.name");
2.15 - if (os.indexOf("Win") >= 0) { // NOI18N
2.16 - if (isUseUnixShell()) configFileName = "cvsWin98.xml"; // NOI18N
2.17 - else configFileName = "cvsWin.xml"; // NOI18N
2.18 - } else configFileName = "cvsUnix.xml"; // NOI18N
2.19 + configFileName = CONFIG_CVS;
2.20 CommandLineVcsFileSystem fs = new CommandLineVcsFileSystem();
2.21 fs.readConfiguration(configFileName);
2.22 fs.setConfigFileName(configFileName);