[Jdvb-cvs] jdvb-server/src/uk/midearth/dvb/server JDVBServer.java,1.2,1.3 RemoteDVB.java,1.2,1.3 RMI.java,1.2,1.3

[pinder <hu...@us...>]

Update of /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092/src/uk/midearth/dvb/server

Modified Files:
	JDVBServer.java RemoteDVB.java RMI.java 
Log Message:
close use of System.out.println

Index: JDVBServer.java
===================================================================
RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/JDVBServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JDVBServer.java	19 Feb 2006 16:59:32 -0000	1.2
--- JDVBServer.java	24 Feb 2006 03:49:26 -0000	1.3
***************
*** 18,29 ****
  	public static void main(String[] argv) {
  		if ((argv.length != 2) && (argv.length != 3)) {
! 			System.out.println("JDVBServer usage:");
! 			System.out
! 					.println("  java JDVBServer <channels config file> <server config file> [daemon]");
  			System.exit(1);
  		}
  		String configFilename = argv[0];
  		String serverFilename = argv[1];
! 		System.out.println("DVBServer>> Working on " + configFilename + " and "
  				+ serverFilename);
  		//File newFile = new File(configFilename);
--- 18,29 ----
  	public static void main(String[] argv) {
  		if ((argv.length != 2) && (argv.length != 3)) {
! 			LOG.error("JDVBServer usage:");
! 			LOG.error("  java JDVBServer <channels config file> <server config file> [daemon]");
! 			LOG.error("Quitting for now");
  			System.exit(1);
  		}
  		String configFilename = argv[0];
  		String serverFilename = argv[1];
! 		LOG.info("DVBServer>> Working on " + configFilename + " and "
  				+ serverFilename);
  		//File newFile = new File(configFilename);

Index: RMI.java
===================================================================
RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/RMI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RMI.java	19 Feb 2006 16:59:32 -0000	1.2
--- RMI.java	24 Feb 2006 03:49:26 -0000	1.3
***************
*** 24,28 ****
  	public RMI(String configFilename, String serverFilename, boolean daemon) {
  		try {
! 			conf = new Configurator(serverFilename);
  
  			java.rmi.registry.LocateRegistry.createRegistry(Integer
--- 24,28 ----
  	public RMI(String configFilename, String serverFilename, boolean daemon) {
  		try {
! 			conf = Configurator.getInstance();
  
  			java.rmi.registry.LocateRegistry.createRegistry(Integer
***************
*** 39,43 ****
  				virtualConsole();
  		} catch (Exception e) {
! 			System.err.println("RMI>> Server failed: " + e);
  		}
  	}
--- 39,43 ----
  				virtualConsole();
  		} catch (Exception e) {
! 			LOG.error("RMI>> Server failed: " + e.getMessage(), e);
  		}
  	}
***************
*** 53,59 ****
  				processCommand(command);
  			} catch (IOException e) {
! 				System.err
! 						.println("RMI>> Error in handling input for console: "
! 								+ e);
  			}
  		}
--- 53,58 ----
  				processCommand(command);
  			} catch (IOException e) {
! 				LOG.error("RMI>> Error in handling input for console: "
! 								+ e.getMessage(), e);
  			}
  		}
***************
*** 65,70 ****
  				remoteDVB.stopNow();
  			} catch (RemoteException e) {
! 				System.out.println("RMI>> Failed to clean up server: " + e);
! 				e.printStackTrace();
  			}
  			System.out.println("RMI>> Quitting... have a nice day");
--- 64,68 ----
  				remoteDVB.stopNow();
  			} catch (RemoteException e) {
! 				LOG.error("RMI>> Failed to clean up server: " + e.getMessage(), e);
  			}
  			System.out.println("RMI>> Quitting... have a nice day");
***************
*** 76,82 ****
  				remoteDVB.stdOut();
  			} catch (RemoteException e) {
! 				System.out.println("RMI>> Failed to show stdout and stderr : "
! 						+ e);
! 				e.printStackTrace();
  			}
  		}
--- 74,79 ----
  				remoteDVB.stdOut();
  			} catch (RemoteException e) {
! 				LOG.error("RMI>> Failed to show stdout and stderr : "
! 						+ e.getMessage(), e);
  			}
  		}

Index: RemoteDVB.java
===================================================================
RCS file: /cvsroot/jdvb/jdvb-server/src/uk/midearth/dvb/server/RemoteDVB.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RemoteDVB.java	19 Feb 2006 16:59:32 -0000	1.2
--- RemoteDVB.java	24 Feb 2006 03:49:26 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  
  import uk.midearth.dvb.confParser.*;
+ import uk.midearth.dvb.exception.JDVBException;
  
  public class RemoteDVB extends UnicastRemoteObject implements
***************
*** 29,36 ****
  
  	public RemoteDVB(String newConfigFilename, String newConfFilename)
! 			throws RemoteException {
! 		System.out.println("RemoteDVB>> Creating remote RemoteDVB object");
  		confParser = new ConfParser(newConfigFilename);
! 		conf = new Configurator(newConfFilename);
  		tzapThread.start();
  	}
--- 30,37 ----
  
  	public RemoteDVB(String newConfigFilename, String newConfFilename)
! 			throws RemoteException, JDVBException {
! 		LOG.info("RemoteDVB>> Creating remote RemoteDVB object");
  		confParser = new ConfParser(newConfigFilename);
! 		conf = Configurator.getInstance();
  		tzapThread.start();
  	}
***************
*** 126,131 ****
  					// ...");
  				} catch (Exception e) {
! 					System.out.println("RemoteDVB.TzapListner>> Tzap died: "
! 							+ e);
  					e.printStackTrace();
  				}
--- 127,132 ----
  					// ...");
  				} catch (Exception e) {
! 					LOG.error("RemoteDVB.TzapListner>> Tzap died: "
! 							+ e.getMessage(), e);
  					e.printStackTrace();
  				}
***************
*** 160,167 ****
  				}
  			} catch (Exception e) {
! 				System.out
! 						.println("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e);
! 				e.printStackTrace();
  			}
  			try {
--- 161,166 ----
  				}
  			} catch (Exception e) {
! 				LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e.getMessage(), e);
  			}
  			try {
***************
*** 172,179 ****
  				}
  			} catch (Exception e) {
! 				System.out
! 						.println("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e);
! 				e.printStackTrace();
  			}
  		}
--- 171,176 ----
  				}
  			} catch (Exception e) {
! 				LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e.getMessage(), e);
  			}
  		}
***************
*** 187,194 ****
  				}
  			} catch (Exception e) {
! 				System.out
! 						.println("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e);
! 				e.printStackTrace();
  			}
  			try {
--- 184,189 ----
  				}
  			} catch (Exception e) {
! 				LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e.getMessage(), e);
  			}
  			try {
***************
*** 199,206 ****
  				}
  			} catch (Exception e) {
! 				System.out
! 						.println("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e);
! 				e.printStackTrace();
  			}
  		}
--- 194,199 ----
  				}
  			} catch (Exception e) {
! 				LOG.error("RemoteDVB.TzapThread>> Failed to show stderr: "
! 								+ e.getMessage(), e);
  			}
  		}