Author: chatellier Date: 2009-04-24 15:56:19 +0000 (Fri, 24 Apr 2009) New Revision: 2144 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUserInfo.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add log info message if ssh key is found, or not found Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-24 15:56:19 UTC (rev 2144) @@ -423,6 +423,11 @@ jsch.addIdentity(sshKey.getAbsolutePath()); sshKeyUsed = true; } + else { + if (log.isInfoEnabled()) { + log.info(_("Can't read ssh key : %s", sshKey)); + } + } Session session = jsch.getSession(username, host, port); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUserInfo.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUserInfo.java 2009-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUserInfo.java 2009-04-24 15:56:19 UTC (rev 2144) @@ -20,7 +20,6 @@ import javax.swing.JOptionPane; import javax.swing.JPasswordField; -import javax.swing.JTextField; import com.jcraft.jsch.UserInfo; Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-24 15:56:19 UTC (rev 2144) @@ -16,6 +16,7 @@ Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= Can't\ instantiate\ %s= Can't\ open\ log\ for\ %s= +Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= Check\ syntax\ of\ the\ current\ script= @@ -166,6 +167,7 @@ isisfish.config.main.regionMap.description= isisfish.config.main.remoteCaparmor.description= isisfish.config.main.resultExport.description= +isisfish.config.main.simulation.max.simultaneous.simulation.description= isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description= isisfish.config.main.simulation.ssh.control.check.interval.description= isisfish.config.main.simulation.ssh.datapath.description= @@ -251,7 +253,6 @@ isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.factor.coefValueIsOne=Coefficient can't be equal to 1 isisfish.error.factor.invalid=Factor is not valid isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion @@ -292,7 +293,6 @@ isisfish.error.no.sector=No sector defined isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.found.class=this class does not isisfish.error.not.found.code=could not found codeclass for %1$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %2$s @@ -359,8 +359,6 @@ isisfish.error.wait.simThread=Can't wait SimThread isisfish.error.warning.title=Warning isisfish.error.write.simulation=Can't write information %1$s -isisfish.exit.text=Something has change, please enter a comment -isisfish.exit.title=Exit isisfish.export.directory=Export directory isisfish.export.saved=Export saved isisfish.export.title=Results export Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-24 15:56:19 UTC (rev 2144) @@ -16,6 +16,7 @@ Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= Can't\ instantiate\ %s= Can't\ open\ log\ for\ %s= +Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= Check\ syntax\ of\ the\ current\ script= @@ -166,6 +167,7 @@ isisfish.config.main.regionMap.description=le nom du r\u00E9pertoire contenant les maps d'une r\u00E9gion isisfish.config.main.remoteCaparmor.description=lance les simulations sur un serveur distant isisfish.config.main.resultExport.description=TODO +isisfish.config.main.simulation.max.simultaneous.simulation.description= isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description= isisfish.config.main.simulation.ssh.control.check.interval.description= isisfish.config.main.simulation.ssh.datapath.description= @@ -251,7 +253,6 @@ isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.factor.coefValueIsOne=Un co\u00E9fficient ne peux pas \u00EAtre \u00E9gual \u00E0 1 isisfish.error.factor.invalid=Le facteur n'est pas valide isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion @@ -292,7 +293,6 @@ isisfish.error.no.sector=il n'y a pas de secteur de d\u00E9finit isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.found.class=this class does not isisfish.error.not.found.code=could not found codeclass for %1$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %2$s @@ -359,8 +359,6 @@ isisfish.error.wait.simThread=Can't wait SimThread isisfish.error.warning.title=Attention isisfish.error.write.simulation=Can't write information %1$s -isisfish.exit.text=Quelque chose a chang\u00E9, merci de saisir un commentaire -isisfish.exit.title=Exit isisfish.export.directory=Dossier d'export isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s isisfish.export.title=Export des r\u00E9sultats