Index: application/Properties.txt
===================================================================
RCS file: E:/cvsroot/jcvs/application/Properties.txt,v
retrieving revision 1.1.1.4
retrieving revision 1.4
diff -c -r1.1.1.4 -r1.4
*** application/Properties.txt	1998/08/04 13:32:55	1.1.1.4
--- application/Properties.txt	1998/08/05 02:30:03	1.4
***************
*** 29,35 ****
  # jCVS.rshCommand.default=/usr/ucb/rsh
  jCVS.rshCommand.default.Solaris=/usr/ucb/rsh
  
- 
  # ------------------------------------------------------------------
  # The remaining properties can generally be left as they are...
  # ------------------------------------------------------------------
--- 29,34 ----
***************
*** 53,59 ****
  
  # The temporary directory. This is ONLY consulted
  # if there is no 'TEMP' or 'TMP' property defined.
! jCVS.global.temporaryDirectory=C:/windows/temp
  jCVS.global.temporaryDirectory.Solaris=/tmp
  jCVS.global.temporaryDirectory.Windows_NT=E:/temp
  
--- 52,58 ----
  
  # The temporary directory. This is ONLY consulted
  # if there is no 'TEMP' or 'TMP' property defined.
! #jCVS.global.temporaryDirectory=C:/windows/temp
  jCVS.global.temporaryDirectory.Solaris=/tmp
  jCVS.global.temporaryDirectory.Windows_NT=E:/temp
  
***************
*** 514,520 ****
  jCVS.openFile.method.gif=SH
  jCVS.openFile.method.doc=SH
  
! jCVS.openFile.args=SHX
  
  # 
  # The following PATH properties will be searched for
--- 513,519 ----
  jCVS.openFile.method.gif=SH
  jCVS.openFile.method.doc=SH
  
! #jCVS.openFile.args=SHX
  
  # 
  # The following PATH properties will be searched for
***************
*** 610,612 ****
--- 609,625 ----
  #
  # jCVS.setVars.all.0=RCSBIN=/usr/local/bin
  #
+ 
+ #
+ # OS/2 specific properties.
+ #
+ jCVS.rshCommand.default=rsh -b
+ 
+ jCVS.global.temporaryDirectory=C:/temp
+ 
+ jCVS.openFile.args=EPM
+ jCVS.openFile.SH.EPM.argc=3
+ jCVS.openFile.SH.EPM.argv.0=c:\\os2\\apps\\epm.exe
+ jCVS.openFile.SH.EPM.argv.1=/m
+ jCVS.openFile.SH.EPM.argv.2=*F
+ 
Index: source/com/ice/cvsc/CVSClient.java
===================================================================
RCS file: E:/cvsroot/jcvs/source/com/ice/cvsc/CVSClient.java,v
retrieving revision 1.1.1.4
retrieving revision 1.3
diff -c -r1.1.1.4 -r1.3
*** source/com/ice/cvsc/CVSClient.java	1998/08/04 13:33:02	1.1.1.4
--- source/com/ice/cvsc/CVSClient.java	1998/08/04 13:40:32	1.3
***************
*** 2804,2826 ****
  						int index =
  							request.getServerCommand().indexOf( ' ' );
  
! 						String[] argv = new String[6];
  
! 						argv[0] = request.getRshProcess();
! 						argv[1] = request.getHostName();
! 						argv[2] = "-l";
! 						argv[3] = request.getUserName();
  						if ( index < 0 )
  							{
! 							argv[4] = request.getServerCommand();
! 							argv[5] = "server";
  							}
  						else
  							{
! 							argv[4] =
  								request.getServerCommand().substring
  									( 0, index );
! 							argv[5] = 
  								request.getServerCommand().substring
  									( index + 1 );
  							}
--- 2804,2834 ----
  						int index =
  							request.getServerCommand().indexOf( ' ' );
  
! 						StringTokenizer tokenizer =
! 							new StringTokenizer( request.getRshProcess() );
  
! 						String[] argv =
! 							new String[tokenizer.countTokens() + 5];
! 
! 						int argc = 0;
! 
! 						while ( tokenizer.hasMoreElements() )
! 							argv[argc++] = (String)tokenizer.nextElement();
! 
! 						argv[argc++] = request.getHostName();
! 						argv[argc++] = "-l";
! 						argv[argc++] = request.getUserName();
  						if ( index < 0 )
  							{
! 							argv[argc++] = request.getServerCommand();
! 							argv[argc++] = "server";
  							}
  						else
  							{
! 							argv[argc++] =
  								request.getServerCommand().substring
  									( 0, index );
! 							argv[argc++] = 
  								request.getServerCommand().substring
  									( index + 1 );
  							}
***************
*** 2999,3005 ****
  					}
  				if ( this.process != null )
  					{
! 					this.process.destroy();
  					}
  				}
  			catch ( IOException ex )
--- 3007,3019 ----
  					}
  				if ( this.process != null )
  					{
! 					try
! 						{
! 						this.process.waitFor();
! 						}
! 					catch ( InterruptedException ex )
! 						{
! 						}
  					}
  				}
  			catch ( IOException ex )
Index: source/com/ice/jcvs/CVSApplet.java
===================================================================
RCS file: E:/cvsroot/jcvs/source/com/ice/jcvs/CVSApplet.java,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -c -r1.1.1.4 -r1.2
*** source/com/ice/jcvs/CVSApplet.java	1998/08/04 13:33:04	1.1.1.4
--- source/com/ice/jcvs/CVSApplet.java	1998/08/04 13:47:47	1.2
***************
*** 602,608 ****
  		String fileName =
  			CVSApplication.getProperty
  				( "jCVS.mainWindow.projectList.fileName",
! 					"projects.txt" );
  
  		String filePath =
  			CVSApplication.getProperty
--- 602,608 ----
  		String fileName =
  			CVSApplication.getProperty
  				( "jCVS.mainWindow.projectList.fileName",
! 					"Projects.txt" );
  
  		String filePath =
  			CVSApplication.getProperty
***************
*** 735,747 ****
  		PrintWriter			writer;
  		CVSProjectChoice	choice;
  
! 		String listPath =
  			CVSApplication.getProperty
! 				( "jCVS.mainWindow.projectList.pathName",
  					"Projects.txt" );
  
! 		File listFile = new File( listPath );
  
  		try {
  			writer =
  				new PrintWriter(
--- 735,759 ----
  		PrintWriter			writer;
  		CVSProjectChoice	choice;
  
! 		String fileName =
  			CVSApplication.getProperty
! 				( "jCVS.mainWindow.projectList.fileName",
  					"Projects.txt" );
  
! 		String filePath =
! 			CVSApplication.getProperty
! 				( "jCVS.mainWindow.projectList.filePath", null );
  
+ 		if ( filePath == null )
+ 			{
+ 			filePath = CVSApplication.getProperty( "user.home", null );
+ 			}
+ 
+ 		File listFile =
+ 			( filePath == null )
+ 				? new File( fileName )
+ 				: new File( filePath, fileName );
+ 
  		try {
  			writer =
  				new PrintWriter(
***************
*** 752,758 ****
  			CVSUserDialog.Error
  				( "CVSApplet.saveChoiceList: "
  					+ "Could not open project choices file '"
! 					+ listPath + "' to save list.\n   " + ex.getMessage() );
  			return;
  			}
  
--- 764,771 ----
  			CVSUserDialog.Error
  				( "CVSApplet.saveChoiceList: "
  					+ "Could not open project choices file '"
! 					+ listFile.getPath() + "' to save list.\n   "
! 					+ ex.getMessage() );
  			return;
  			}
  
***************
*** 807,813 ****
  				CVSUserDialog.Error(
  					"CVSApplet.saveChoiceList: "
  						+ "ERROR writing project choices file '"
! 						+ listPath + "' - " + ex.getMessage() );
  				}
  			}
  
--- 820,826 ----
  				CVSUserDialog.Error(
  					"CVSApplet.saveChoiceList: "
  						+ "ERROR writing project choices file '"
! 						+ listFile.getPath() + "' - " + ex.getMessage() );
  				}
  			}
  
Index: source/com/ice/jcvs/Properties.txt
===================================================================
RCS file: E:/cvsroot/jcvs/source/com/ice/jcvs/Properties.txt,v
retrieving revision 1.1.1.2
retrieving revision 1.3
diff -c -r1.1.1.2 -r1.3
*** source/com/ice/jcvs/Properties.txt	1998/08/04 13:33:07	1.1.1.2
--- source/com/ice/jcvs/Properties.txt	1998/08/04 13:40:35	1.3
***************
*** 29,34 ****
--- 29,38 ----
  # jCVS.rshCommand.default=/usr/ucb/rsh
  jCVS.rshCommand.default.Solaris=/usr/ucb/rsh
  
+ #
+ # Uncomment the following line if you are using OS/2's rsh.
+ #
+ # jCVS.rshCommand.default=rsh -b
  
  # ------------------------------------------------------------------
  # The remaining properties can generally be left as they are...
***************
*** 608,610 ****
--- 612,623 ----
  #
  # jCVS.setVars.all.0=RCSBIN=/usr/local/bin
  #
+ 
+ #
+ # Use these for OS/2's EPM editor.
+ #
+ #jCVS.openFile.args=EPM
+ jCVS.openFile.SH.EPM.argc=3
+ jCVS.openFile.SH.EPM.argv.0=c:\\os2\\apps\\epm.exe
+ jCVS.openFile.SH.EPM.argv.1=/m
+ jCVS.openFile.SH.EPM.argv.2=*F
