home *** CD-ROM | disk | FTP | other *** search
/ OS/2 Shareware BBS: 10 Tools / 10-Tools.zip / cvs110.zip / cvs / jCVS-4.7.2 / diffs next >
Text File  |  1998-08-04  |  8KB  |  298 lines
  1. Index: application/Properties.txt
  2. ===================================================================
  3. RCS file: E:/cvsroot/jcvs/application/Properties.txt,v
  4. retrieving revision 1.1.1.4
  5. retrieving revision 1.4
  6. diff -c -r1.1.1.4 -r1.4
  7. *** application/Properties.txt    1998/08/04 13:32:55    1.1.1.4
  8. --- application/Properties.txt    1998/08/05 02:30:03    1.4
  9. ***************
  10. *** 29,35 ****
  11.   # jCVS.rshCommand.default=/usr/ucb/rsh
  12.   jCVS.rshCommand.default.Solaris=/usr/ucb/rsh
  13.   
  14. - 
  15.   # ------------------------------------------------------------------
  16.   # The remaining properties can generally be left as they are...
  17.   # ------------------------------------------------------------------
  18. --- 29,34 ----
  19. ***************
  20. *** 53,59 ****
  21.   
  22.   # The temporary directory. This is ONLY consulted
  23.   # if there is no 'TEMP' or 'TMP' property defined.
  24. ! jCVS.global.temporaryDirectory=C:/windows/temp
  25.   jCVS.global.temporaryDirectory.Solaris=/tmp
  26.   jCVS.global.temporaryDirectory.Windows_NT=E:/temp
  27.   
  28. --- 52,58 ----
  29.   
  30.   # The temporary directory. This is ONLY consulted
  31.   # if there is no 'TEMP' or 'TMP' property defined.
  32. ! #jCVS.global.temporaryDirectory=C:/windows/temp
  33.   jCVS.global.temporaryDirectory.Solaris=/tmp
  34.   jCVS.global.temporaryDirectory.Windows_NT=E:/temp
  35.   
  36. ***************
  37. *** 514,520 ****
  38.   jCVS.openFile.method.gif=SH
  39.   jCVS.openFile.method.doc=SH
  40.   
  41. ! jCVS.openFile.args=SHX
  42.   
  43.   # 
  44.   # The following PATH properties will be searched for
  45. --- 513,519 ----
  46.   jCVS.openFile.method.gif=SH
  47.   jCVS.openFile.method.doc=SH
  48.   
  49. ! #jCVS.openFile.args=SHX
  50.   
  51.   # 
  52.   # The following PATH properties will be searched for
  53. ***************
  54. *** 610,612 ****
  55. --- 609,625 ----
  56.   #
  57.   # jCVS.setVars.all.0=RCSBIN=/usr/local/bin
  58.   #
  59. + 
  60. + #
  61. + # OS/2 specific properties.
  62. + #
  63. + jCVS.rshCommand.default=rsh -b
  64. + 
  65. + jCVS.global.temporaryDirectory=C:/temp
  66. + 
  67. + jCVS.openFile.args=EPM
  68. + jCVS.openFile.SH.EPM.argc=3
  69. + jCVS.openFile.SH.EPM.argv.0=c:\\os2\\apps\\epm.exe
  70. + jCVS.openFile.SH.EPM.argv.1=/m
  71. + jCVS.openFile.SH.EPM.argv.2=*F
  72. + 
  73. Index: source/com/ice/cvsc/CVSClient.java
  74. ===================================================================
  75. RCS file: E:/cvsroot/jcvs/source/com/ice/cvsc/CVSClient.java,v
  76. retrieving revision 1.1.1.4
  77. retrieving revision 1.3
  78. diff -c -r1.1.1.4 -r1.3
  79. *** source/com/ice/cvsc/CVSClient.java    1998/08/04 13:33:02    1.1.1.4
  80. --- source/com/ice/cvsc/CVSClient.java    1998/08/04 13:40:32    1.3
  81. ***************
  82. *** 2804,2826 ****
  83.                           int index =
  84.                               request.getServerCommand().indexOf( ' ' );
  85.   
  86. !                         String[] argv = new String[6];
  87.   
  88. !                         argv[0] = request.getRshProcess();
  89. !                         argv[1] = request.getHostName();
  90. !                         argv[2] = "-l";
  91. !                         argv[3] = request.getUserName();
  92.                           if ( index < 0 )
  93.                               {
  94. !                             argv[4] = request.getServerCommand();
  95. !                             argv[5] = "server";
  96.                               }
  97.                           else
  98.                               {
  99. !                             argv[4] =
  100.                                   request.getServerCommand().substring
  101.                                       ( 0, index );
  102. !                             argv[5] = 
  103.                                   request.getServerCommand().substring
  104.                                       ( index + 1 );
  105.                               }
  106. --- 2804,2834 ----
  107.                           int index =
  108.                               request.getServerCommand().indexOf( ' ' );
  109.   
  110. !                         StringTokenizer tokenizer =
  111. !                             new StringTokenizer( request.getRshProcess() );
  112.   
  113. !                         String[] argv =
  114. !                             new String[tokenizer.countTokens() + 5];
  115. ! 
  116. !                         int argc = 0;
  117. ! 
  118. !                         while ( tokenizer.hasMoreElements() )
  119. !                             argv[argc++] = (String)tokenizer.nextElement();
  120. ! 
  121. !                         argv[argc++] = request.getHostName();
  122. !                         argv[argc++] = "-l";
  123. !                         argv[argc++] = request.getUserName();
  124.                           if ( index < 0 )
  125.                               {
  126. !                             argv[argc++] = request.getServerCommand();
  127. !                             argv[argc++] = "server";
  128.                               }
  129.                           else
  130.                               {
  131. !                             argv[argc++] =
  132.                                   request.getServerCommand().substring
  133.                                       ( 0, index );
  134. !                             argv[argc++] = 
  135.                                   request.getServerCommand().substring
  136.                                       ( index + 1 );
  137.                               }
  138. ***************
  139. *** 2999,3005 ****
  140.                       }
  141.                   if ( this.process != null )
  142.                       {
  143. !                     this.process.destroy();
  144.                       }
  145.                   }
  146.               catch ( IOException ex )
  147. --- 3007,3019 ----
  148.                       }
  149.                   if ( this.process != null )
  150.                       {
  151. !                     try
  152. !                         {
  153. !                         this.process.waitFor();
  154. !                         }
  155. !                     catch ( InterruptedException ex )
  156. !                         {
  157. !                         }
  158.                       }
  159.                   }
  160.               catch ( IOException ex )
  161. Index: source/com/ice/jcvs/CVSApplet.java
  162. ===================================================================
  163. RCS file: E:/cvsroot/jcvs/source/com/ice/jcvs/CVSApplet.java,v
  164. retrieving revision 1.1.1.4
  165. retrieving revision 1.2
  166. diff -c -r1.1.1.4 -r1.2
  167. *** source/com/ice/jcvs/CVSApplet.java    1998/08/04 13:33:04    1.1.1.4
  168. --- source/com/ice/jcvs/CVSApplet.java    1998/08/04 13:47:47    1.2
  169. ***************
  170. *** 602,608 ****
  171.           String fileName =
  172.               CVSApplication.getProperty
  173.                   ( "jCVS.mainWindow.projectList.fileName",
  174. !                     "projects.txt" );
  175.   
  176.           String filePath =
  177.               CVSApplication.getProperty
  178. --- 602,608 ----
  179.           String fileName =
  180.               CVSApplication.getProperty
  181.                   ( "jCVS.mainWindow.projectList.fileName",
  182. !                     "Projects.txt" );
  183.   
  184.           String filePath =
  185.               CVSApplication.getProperty
  186. ***************
  187. *** 735,747 ****
  188.           PrintWriter            writer;
  189.           CVSProjectChoice    choice;
  190.   
  191. !         String listPath =
  192.               CVSApplication.getProperty
  193. !                 ( "jCVS.mainWindow.projectList.pathName",
  194.                       "Projects.txt" );
  195.   
  196. !         File listFile = new File( listPath );
  197.   
  198.           try {
  199.               writer =
  200.                   new PrintWriter(
  201. --- 735,759 ----
  202.           PrintWriter            writer;
  203.           CVSProjectChoice    choice;
  204.   
  205. !         String fileName =
  206.               CVSApplication.getProperty
  207. !                 ( "jCVS.mainWindow.projectList.fileName",
  208.                       "Projects.txt" );
  209.   
  210. !         String filePath =
  211. !             CVSApplication.getProperty
  212. !                 ( "jCVS.mainWindow.projectList.filePath", null );
  213.   
  214. +         if ( filePath == null )
  215. +             {
  216. +             filePath = CVSApplication.getProperty( "user.home", null );
  217. +             }
  218. + 
  219. +         File listFile =
  220. +             ( filePath == null )
  221. +                 ? new File( fileName )
  222. +                 : new File( filePath, fileName );
  223. + 
  224.           try {
  225.               writer =
  226.                   new PrintWriter(
  227. ***************
  228. *** 752,758 ****
  229.               CVSUserDialog.Error
  230.                   ( "CVSApplet.saveChoiceList: "
  231.                       + "Could not open project choices file '"
  232. !                     + listPath + "' to save list.\n   " + ex.getMessage() );
  233.               return;
  234.               }
  235.   
  236. --- 764,771 ----
  237.               CVSUserDialog.Error
  238.                   ( "CVSApplet.saveChoiceList: "
  239.                       + "Could not open project choices file '"
  240. !                     + listFile.getPath() + "' to save list.\n   "
  241. !                     + ex.getMessage() );
  242.               return;
  243.               }
  244.   
  245. ***************
  246. *** 807,813 ****
  247.                   CVSUserDialog.Error(
  248.                       "CVSApplet.saveChoiceList: "
  249.                           + "ERROR writing project choices file '"
  250. !                         + listPath + "' - " + ex.getMessage() );
  251.                   }
  252.               }
  253.   
  254. --- 820,826 ----
  255.                   CVSUserDialog.Error(
  256.                       "CVSApplet.saveChoiceList: "
  257.                           + "ERROR writing project choices file '"
  258. !                         + listFile.getPath() + "' - " + ex.getMessage() );
  259.                   }
  260.               }
  261.   
  262. Index: source/com/ice/jcvs/Properties.txt
  263. ===================================================================
  264. RCS file: E:/cvsroot/jcvs/source/com/ice/jcvs/Properties.txt,v
  265. retrieving revision 1.1.1.2
  266. retrieving revision 1.3
  267. diff -c -r1.1.1.2 -r1.3
  268. *** source/com/ice/jcvs/Properties.txt    1998/08/04 13:33:07    1.1.1.2
  269. --- source/com/ice/jcvs/Properties.txt    1998/08/04 13:40:35    1.3
  270. ***************
  271. *** 29,34 ****
  272. --- 29,38 ----
  273.   # jCVS.rshCommand.default=/usr/ucb/rsh
  274.   jCVS.rshCommand.default.Solaris=/usr/ucb/rsh
  275.   
  276. + #
  277. + # Uncomment the following line if you are using OS/2's rsh.
  278. + #
  279. + # jCVS.rshCommand.default=rsh -b
  280.   
  281.   # ------------------------------------------------------------------
  282.   # The remaining properties can generally be left as they are...
  283. ***************
  284. *** 608,610 ****
  285. --- 612,623 ----
  286.   #
  287.   # jCVS.setVars.all.0=RCSBIN=/usr/local/bin
  288.   #
  289. + 
  290. + #
  291. + # Use these for OS/2's EPM editor.
  292. + #
  293. + #jCVS.openFile.args=EPM
  294. + jCVS.openFile.SH.EPM.argc=3
  295. + jCVS.openFile.SH.EPM.argv.0=c:\\os2\\apps\\epm.exe
  296. + jCVS.openFile.SH.EPM.argv.1=/m
  297. + jCVS.openFile.SH.EPM.argv.2=*F
  298.