October 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2711 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 29 Oct '09

29 Oct '09

Author: chatellier Date: 2009-10-29 13:03:55 +0000 (Thu, 29 Oct 2009) New Revision: 2711 Modified: isis-fish/trunk/pom.xml Log: H2 version bump Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-29 09:26:23 UTC (rev 2710) +++ isis-fish/trunk/pom.xml 2009-10-29 13:03:55 UTC (rev 2711) @@ -224,7 +224,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.121</version> + <version>1.2.122</version> <scope>compile</scope> </dependency>

1 0

r2710 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging
by chatellier＠users.labs.libre-entreprise.org 29 Oct '09

29 Oct '09

Author: chatellier Date: 2009-10-29 09:26:23 +0000 (Thu, 29 Oct 2009) New Revision: 2710 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java Log: Add some categories (rules, sensitivity export) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2009-10-28 15:41:46 UTC (rev 2709) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2009-10-29 09:26:23 UTC (rev 2710) @@ -78,10 +78,12 @@ /** les catégories rattachées au logger de script. */ private static final String[] scriptLoggerToChange = { + "exports", + "formules", + "rules", "scripts", "simulators", - "exports", - "formules" + "sensitivityexports" }; /** les catégories rattachées au logger de librairies. */

1 0

r2709 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh
by chatellier＠users.labs.libre-entreprise.org 28 Oct '09

28 Oct '09

Author: chatellier Date: 2009-10-28 15:41:46 +0000 (Wed, 28 Oct 2009) New Revision: 2709 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java Log: Add sftp utilities methods. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2009-10-28 13:31:45 UTC (rev 2708) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2009-10-28 15:41:46 UTC (rev 2709) @@ -29,14 +29,19 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Writer; +import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.jcraft.jsch.Channel; import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; +import com.jcraft.jsch.SftpATTRS; +import com.jcraft.jsch.SftpException; +import com.jcraft.jsch.SftpProgressMonitor; /** * SSH utils class. @@ -44,9 +49,9 @@ * All this code has be taken from ant optionnal ssh task. * * Use full for: + * - exec command * - scpTo command * - scpFrom command - * - exec command * * @author chatellier * @version $Revision$ @@ -61,7 +66,7 @@ protected static final byte LINE_FEED = 0x0a; protected static final int BUFFER_SIZE = 1024; - private static final int HUNDRED_KILOBYTES = 102400; + protected static final int HUNDRED_KILOBYTES = 102400; /** Utility class */ protected SSHUtils() { @@ -467,4 +472,202 @@ fis.close(); } } + + /** + * Progress monitor (sftp). + */ + protected static class ProgressMonitor implements SftpProgressMonitor { + private long initFileSize = 0; + private long totalLength = 0; + private int percentTransmitted = 0; + + public void init(int op, String src, String dest, long max) { + initFileSize = max; + totalLength = 0; + percentTransmitted = 0; + } + + public boolean count(long len) { + totalLength += len; + percentTransmitted = trackProgress(initFileSize, + totalLength, + percentTransmitted); + return true; + } + + public void end() { + + } + + public long getTotalLength() { + return totalLength; + } + } + + /** + * Open sftp channel. + * + * @param session + * @return + * @throws JSchException + */ + protected static ChannelSftp openSftpChannel(Session session) throws JSchException { + ChannelSftp channel = (ChannelSftp) session.openChannel("sftp"); + return channel; + } + + /** + * Perform sftp file transfert. + * + * @param session + * @param localFile + * @param remotePath + * + * @throws SSHException on i/o errors + */ + public static void sftpFrom(Session session, File localFile, String remotePath) throws SSHException { + ChannelSftp channel = null; + try { + channel = openSftpChannel(session); + channel.connect(); + try { + SftpATTRS attrs = channel.stat(remotePath); + if (attrs.isDir() && !remotePath.endsWith("/")) { + remotePath = remotePath + "/"; + } + } catch (SftpException ee) { + // Ignored + } + getDir(channel, remotePath, localFile); + } catch (SftpException e) { + throw new SSHException(e); + } catch (JSchException e) { + throw new SSHException(e); + } catch (IOException e) { + throw new SSHException(e); + } finally { + if (channel != null) { + channel.disconnect(); + } + } + } + + protected static void getDir(ChannelSftp channel, + String remoteFile, + File localFile) throws IOException, SftpException { + String pwd = remoteFile; + if (remoteFile.lastIndexOf('/') != -1) { + if (remoteFile.length() > 1) { + pwd = remoteFile.substring(0, remoteFile.lastIndexOf('/')); + } + } + channel.cd(pwd); + if (!localFile.exists()) { + localFile.mkdirs(); + } + Vector files = channel.ls(remoteFile); + for (int i = 0; i < files.size(); i++) { + ChannelSftp.LsEntry le = (ChannelSftp.LsEntry) files.elementAt(i); + String name = le.getFilename(); + if (le.getAttrs().isDir()) { + if (name.equals(".") || name.equals("..")) { + continue; + } + getDir(channel, + channel.pwd() + "/" + name + "/", + new File(localFile, le.getFilename())); + } else { + getFile(channel, le, localFile); + } + } + channel.cd(".."); + } + + protected static void getFile(ChannelSftp channel, + ChannelSftp.LsEntry le, + File localFile) throws IOException, SftpException { + String remoteFile = le.getFilename(); + if (!localFile.exists()) { + String path = localFile.getAbsolutePath(); + int i = 0; + if ((i = path.lastIndexOf(File.pathSeparator)) != -1) { + if (path.length() > File.pathSeparator.length()) { + new File(path.substring(0, i)).mkdirs(); + } + } + } + + if (localFile.isDirectory()) { + localFile = new File(localFile, remoteFile); + } + + long totalLength = le.getAttrs().getSize(); + + SftpProgressMonitor monitor = null; + boolean trackProgress = totalLength > HUNDRED_KILOBYTES; + if (trackProgress) { + monitor = new ProgressMonitor(); + } + channel.get(remoteFile, localFile.getAbsolutePath(), monitor); + } + + /** + * Perform sftp file transfert. + * + * @param session + * @param localFile + * @param remoteFilePath + * + * @throws SSHException on i/o errors + */ + public static void sftpTo(Session session, File localFile, + String remoteFilePath) throws SSHException { + try { + doSingleSftpransfer(session, localFile, remoteFilePath); + } catch (IOException e) { + throw new SSHException(e); + } catch (JSchException e) { + throw new SSHException(e); + } + } + + // sftp + protected static void doSingleSftpransfer(Session session, File localFile, + String remoteFilePath) throws IOException, JSchException { + ChannelSftp channel = openSftpChannel(session); + try { + channel.connect(); + try { + sendFileToRemote(channel, localFile, remoteFilePath); + } catch (SftpException e) { + throw new JSchException(e.toString()); + } + } finally { + if (channel != null) { + channel.disconnect(); + } + } + } + + // sftp + protected static void sendFileToRemote(ChannelSftp channel, + File localFile, + String remotePath) + throws IOException, SftpException { + long filesize = localFile.length(); + + if (remotePath == null) { + remotePath = localFile.getName(); + } + + // only track progress for files larger than 100kb in verbose mode + boolean trackProgress = filesize > HUNDRED_KILOBYTES; + + SftpProgressMonitor monitor = null; + if (trackProgress) { + monitor = new ProgressMonitor(); + } + + channel.put(localFile.getAbsolutePath(), remotePath, monitor); + } }

1 0

r2708 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config
by chatellier＠users.labs.libre-entreprise.org 28 Oct '09

28 Oct '09

Author: chatellier Date: 2009-10-28 13:31:45 +0000 (Wed, 28 Oct 2009) New Revision: 2708 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx Log: Sftp server is now optionnal Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2009-10-28 10:17:14 UTC (rev 2707) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2009-10-28 13:31:45 UTC (rev 2708) @@ -83,12 +83,7 @@ // copy values currentSSHsftpServer = sshSftpServerField.getText().trim(); - if (currentSSHsftpServer.isEmpty()) { - setColor(true, sshSftpServerField); - } - else { - setColor(false, sshSftpServerField); - } + // can be empty (optionnal use) currentSSHUsername = usernameField.getText().trim(); if (!currentSSHUsername.matches("\\w+")) {

1 0

r2707 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 28 Oct '09

28 Oct '09

Author: chatellier Date: 2009-10-28 10:17:14 +0000 (Wed, 28 Oct 2009) New Revision: 2707 Modified: 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: Update documentation 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-10-28 10:13:41 UTC (rev 2706) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-10-28 10:17:14 UTC (rev 2707) @@ -178,10 +178,10 @@ isisfish.config.main.simulation.ssh.isis.home.description=Isis-Fish installation directory isisfish.config.main.simulation.ssh.pbsbinpath=PBS executables directory isisfish.config.main.simulation.ssh.pbsbinpath.description=PBS executables (qsub, qdel...) directory -isisfish.config.main.simulation.ssh.server=Server address -isisfish.config.main.simulation.ssh.server.description=Server adress -isisfish.config.main.simulation.ssh.sftpserver=Tranfert server -isisfish.config.main.simulation.ssh.sftpserver.description=Transfert server adress +isisfish.config.main.simulation.ssh.server=Simulation server +isisfish.config.main.simulation.ssh.server.description=Simulation server address +isisfish.config.main.simulation.ssh.sftpserver=Transfer server +isisfish.config.main.simulation.ssh.sftpserver.description=Transfer server address (set empty to use scp from simulation server) isisfish.config.main.simulation.ssh.tmppath=Server temp directory isisfish.config.main.simulation.ssh.tmppath.description=Server temp directory isisfish.config.main.simulation.ssh.userhome=User home directory 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-10-28 10:13:41 UTC (rev 2706) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-10-28 10:17:14 UTC (rev 2707) @@ -178,10 +178,10 @@ isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'Isis-Fish sur le serveur isisfish.config.main.simulation.ssh.pbsbinpath=Emplacement des executables PBS isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur -isisfish.config.main.simulation.ssh.server=Adresse du serveur -isisfish.config.main.simulation.ssh.server.description=Adresse du serveur +isisfish.config.main.simulation.ssh.server=Serveur de simulation +isisfish.config.main.simulation.ssh.server.description=Adresse du serveur de simulation isisfish.config.main.simulation.ssh.sftpserver=Serveur de fichier -isisfish.config.main.simulation.ssh.sftpserver.description=Adresse du serveur de transfert de fichier +isisfish.config.main.simulation.ssh.sftpserver.description=Adresse du serveur de transfert de fichier (laisser vide pour utiliser directement scp sur le serveur de simulation) isisfish.config.main.simulation.ssh.tmppath=Dossier temporaire isisfish.config.main.simulation.ssh.tmppath.description=Emplacement du dossier temporaire isisfish.config.main.simulation.ssh.userhome=R\u00E9pertoire d'accueil

1 0

r2706 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Oct '09

28 Oct '09

Author: chatellier Date: 2009-10-28 10:13:41 +0000 (Wed, 28 Oct 2009) New Revision: 2706 Modified: isis-fish/trunk/pom.xml Log: Add deprecation display Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-27 17:50:23 UTC (rev 2705) +++ isis-fish/trunk/pom.xml 2009-10-28 10:13:41 UTC (rev 2706) @@ -480,6 +480,7 @@ <configuration> <source>1.6</source> <target>1.6</target> + <showDeprecation>true</showDeprecation> </configuration> </plugin> <plugin>

1 0

r2705 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh
by chatellier＠users.labs.libre-entreprise.org 27 Oct '09

27 Oct '09

Author: chatellier Date: 2009-10-27 17:50:23 +0000 (Tue, 27 Oct 2009) New Revision: 2705 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java Log: Code refactoring for scp to prepare following sftp commit. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java 2009-10-27 17:05:06 UTC (rev 2704) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java 2009-10-27 17:50:23 UTC (rev 2705) @@ -19,13 +19,13 @@ package fr.ifremer.isisfish.util.ssh; /** - * TODO COMMENT ME. + * Exception throws for password input cancellation. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 1 avr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class InvalidPassphraseException extends Exception { Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2009-10-27 17:05:06 UTC (rev 2704) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2009-10-27 17:50:23 UTC (rev 2705) @@ -41,10 +41,10 @@ * This is a singleton class. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 1 avr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SSHAgent { Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java 2009-10-27 17:05:06 UTC (rev 2704) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java 2009-10-27 17:50:23 UTC (rev 2705) @@ -22,10 +22,10 @@ * SSHException. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 14 janv. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SSHException extends Exception { @@ -33,13 +33,6 @@ private static final long serialVersionUID = -198651402309210758L; /** - * Constructs a new exception with null as its detail message. - */ - public SSHException() { - super(); - } - - /** * Constructs a new exception with the specified detail message. * * @param message message Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2009-10-27 17:05:06 UTC (rev 2704) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2009-10-27 17:50:23 UTC (rev 2705) @@ -38,10 +38,10 @@ * Password, passphrase... * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 1 déc. 2008 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SSHUserInfo implements UserInfo, UIKeyboardInteractive { Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2009-10-27 17:05:06 UTC (rev 2704) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2009-10-27 17:50:23 UTC (rev 2705) @@ -49,10 +49,10 @@ * - exec command * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 13 janv. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SSHUtils { @@ -69,6 +69,94 @@ } /** + * Send an ack. + * @param out the output stream to use + * @throws IOException on error + */ + protected static void sendAck(OutputStream out) throws IOException { + byte[] buf = new byte[1]; + buf[0] = 0; + out.write(buf); + out.flush(); + } + + /** + * Reads the response, throws a BuildException if the response + * indicates an error. + * @param in the input stream to use + * @throws IOException on I/O error + */ + protected static void waitForAck(InputStream in) throws IOException, + SSHException { + int b = in.read(); + + // b may be 0 for success, + // 1 for error, + // 2 for fatal error, + + if (b == -1) { + // didn't receive any response + throw new SSHException("No response from server"); + } else if (b != 0) { + StringBuffer sb = new StringBuffer(); + + int c = in.read(); + while (c > 0 && c != '\n') { + sb.append((char) c); + c = in.read(); + } + + if (b == 1) { + throw new SSHException("server indicated an error: " + + sb.toString()); + } else if (b == 2) { + throw new SSHException("server indicated a fatal error: " + + sb.toString()); + } else { + throw new SSHException("unknown response, code " + b + + " message: " + sb.toString()); + } + } + } + + /** + * Track progress every 10% if 100kb < filesize < 1mb. For larger + * files track progress for every percent transmitted. + * @param filesize the size of the file been transmitted + * @param totalLength the total transmission size + * @param percentTransmitted the current percent transmitted + * @return the percent that the file is of the total + */ + protected static int trackProgress(long filesize, long totalLength, + int percentTransmitted) { + + int percent = (int) Math.round(Math + .floor((totalLength / (double) filesize) * 100)); + + if (percent > percentTransmitted) { + if (filesize < 1048576) { + if (percent % 5 == 0) { + if (percent == 100) { + System.out.println(" 100%"); + } else { + System.out.print("*"); + } + } + } else { + if (percent == 50) { + System.out.println(" 50%"); + } else if (percent == 100) { + System.out.println(" 100%"); + } else { + System.out.print("."); + } + } + } + + return percent; + } + + /** * Exec command on remote server. * * @param session opened valid session @@ -197,96 +285,7 @@ } } - /** - * Send an ack. - * @param out the output stream to use - * @throws IOException on error - */ - protected static void sendAck(OutputStream out) throws IOException { - byte[] buf = new byte[1]; - buf[0] = 0; - out.write(buf); - out.flush(); - } - - /** - * Reads the response, throws a BuildException if the response - * indicates an error. - * @param in the input stream to use - * @throws IOException on I/O error - */ - protected static void waitForAck(InputStream in) throws IOException, - SSHException { - int b = in.read(); - - // b may be 0 for success, - // 1 for error, - // 2 for fatal error, - - if (b == -1) { - // didn't receive any response - throw new SSHException("No response from server"); - } else if (b != 0) { - StringBuffer sb = new StringBuffer(); - - int c = in.read(); - while (c > 0 && c != '\n') { - sb.append((char) c); - c = in.read(); - } - - if (b == 1) { - throw new SSHException("server indicated an error: " - + sb.toString()); - } else if (b == 2) { - throw new SSHException("server indicated a fatal error: " - + sb.toString()); - } else { - throw new SSHException("unknown response, code " + b - + " message: " + sb.toString()); - } - } - } - - /** - * Track progress every 10% if 100kb < filesize < 1mb. For larger - * files track progress for every percent transmitted. - * @param filesize the size of the file been transmitted - * @param totalLength the total transmission size - * @param percentTransmitted the current percent transmitted - * @return the percent that the file is of the total - */ - protected static int trackProgress(long filesize, long totalLength, - int percentTransmitted) { - - // CheckStyle:MagicNumber OFF - int percent = (int) Math.round(Math - .floor((totalLength / (double) filesize) * 100)); - - if (percent > percentTransmitted) { - if (filesize < 1048576) { - if (percent % 5 == 0) { - if (percent == 100) { - System.out.println(" 100%"); - } else { - System.out.print("*"); - } - } - } else { - if (percent == 50) { - System.out.println(" 50%"); - } else if (percent == 100) { - System.out.println(" 100%"); - } else { - System.out.print("."); - } - } - } - // CheckStyle:MagicNumber ON - - return percent; - } - + // scp protected static void startRemoteCpProtocol(InputStream in, OutputStream out, File localFile) throws IOException, SSHException { File startFile = localFile; @@ -322,6 +321,7 @@ } } + // scp protected static File parseAndCreateDirectory(String serverResponse, File localFile) { int start = serverResponse.indexOf(" "); @@ -337,6 +337,7 @@ return null; } + // scp protected static void parseAndFetchFile(String serverResponse, File localFile, OutputStream out, InputStream in) throws IOException, SSHException { @@ -354,6 +355,7 @@ sendAck(out); } + // scp protected static void fetchFile(File localFile, long filesize, OutputStream out, InputStream in) throws IOException { byte[] buf = new byte[BUFFER_SIZE]; @@ -396,6 +398,7 @@ } } + // scp protected static void doSingleTransfer(Session session, File localFile, String remoteFilePath) throws IOException, JSchException, SSHException { @@ -417,6 +420,7 @@ } } + // scp protected static void sendFileToRemote(File localFile, InputStream in, OutputStream out) throws IOException, SSHException { // send "C0644 filesize filename", where filename should not include '/' Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision

1 0

r2704 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config
by chatellier＠users.labs.libre-entreprise.org 27 Oct '09

27 Oct '09

Author: chatellier Date: 2009-10-27 17:05:06 +0000 (Tue, 27 Oct 2009) New Revision: 2704 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx Log: Set description in tooltip Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2009-10-27 17:02:59 UTC (rev 2703) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2009-10-27 17:05:06 UTC (rev 2704) @@ -336,20 +336,20 @@ <row> <cell> <JLabel id='sshServerLabel' text='isisfish.config.main.simulation.ssh.server' - toolTipText='isisfish.config.main.simulation.ssh.server' /> + toolTipText='isisfish.config.main.simulation.ssh.server.description' /> </cell> <cell fill='horizontal' columns="2"> - <JTextField id='sshServerField' toolTipText='isisfish.config.main.simulation.ssh.server' + <JTextField id='sshServerField' toolTipText='isisfish.config.main.simulation.ssh.server.description' onKeyReleased="doCheck()" /> </cell> </row> <row> <cell> <JLabel id='sshSftpServerLabel' text='isisfish.config.main.simulation.ssh.sftpserver' - toolTipText='isisfish.config.main.simulation.ssh.sftpserver' /> + toolTipText='isisfish.config.main.simulation.ssh.sftpserver.description' /> </cell> <cell fill='horizontal' columns="2"> - <JTextField id='sshSftpServerField' toolTipText='isisfish.config.main.simulation.ssh.sftpserver' + <JTextField id='sshSftpServerField' toolTipText='isisfish.config.main.simulation.ssh.sftpserver.description' onKeyReleased="doCheck()" /> </cell> </row>

1 0

r2703 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui/config resources/i18n
by chatellier＠users.labs.libre-entreprise.org 27 Oct '09

27 Oct '09

Author: chatellier Date: 2009-10-27 17:02:59 +0000 (Tue, 27 Oct 2009) New Revision: 2703 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 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: Ajout de l'adresse caparmor-sftp pour le transfert des fichiers Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-27 13:20:18 UTC (rev 2702) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-10-27 17:02:59 UTC (rev 2703) @@ -357,8 +357,27 @@ public void setSimulatorSshServer(String sshServer) { setOption(Option.SIMULATOR_SSH_SERVER.key, sshServer); } + + /** + * Retourne l'url du service de tranfert de fichier. + * + * @return sftp server + */ + public String getSimulatorSshSftpServer() { + String result = getOption(Option.SIMULATOR_SSH_SFTP_SERVER.key); + return result; + } /** + * Change sftp server url value. + * + * @param sshSftpServer sftp server + */ + public void setSimulatorSshSftpServer(String sshSftpServer) { + setOption(Option.SIMULATOR_SSH_SFTP_SERVER.key, sshSftpServer); + } + + /** * Retourne le login pour acceder au serveur de simulation accessible via SSH. * * @return simulator username @@ -900,7 +919,9 @@ SIMULATOR_PASSWORD("simulator.password", _("isisfish.config.main.password.description"), "guest"), /** Serveur accessible par ssh : address */ - SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor.ifremer.fr"), + SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), + /** Serveur accessible par ssh : nom du service de transfert de fichier */ + SIMULATOR_SSH_SFTP_SERVER("simulation.ssh.sftpserver", _("isisfish.config.main.simulation.ssh.sftpserver.description"), "caparmor-sftp"), /** Serveur accessible par ssh : login */ SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2009-10-27 13:20:18 UTC (rev 2702) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2009-10-27 17:02:59 UTC (rev 2703) @@ -31,6 +31,7 @@ import fr.ifremer.isisfish.util.ssh.SSHUtils; protected String currentSSHserver; + protected String currentSSHsftpServer; protected String currentSSHUsername; protected File currentSSHKey; protected String currentSSHUserhome; @@ -50,6 +51,7 @@ protected void resetSSHConfiguration() { // server config sshServerField.setText(IsisFish.config.getSimulatorSshServer()); + sshSftpServerField.setText(IsisFish.config.getSimulatorSshSftpServer()); usernameField.setText(IsisFish.config.getSimulatorSshUsername()); sshKeyField.setText(IsisFish.config.getSSHPrivateKeyFilePath().getAbsolutePath()); @@ -79,6 +81,15 @@ setColor(false, sshServerField); } + // copy values + currentSSHsftpServer = sshSftpServerField.getText().trim(); + if (currentSSHsftpServer.isEmpty()) { + setColor(true, sshSftpServerField); + } + else { + setColor(false, sshSftpServerField); + } + currentSSHUsername = usernameField.getText().trim(); if (!currentSSHUsername.matches("\\w+")) { setColor(true, usernameField); @@ -152,6 +163,7 @@ */ protected void saveSSHConfiguration() { IsisFish.config.setSimulatorSshServer(currentSSHserver); + IsisFish.config.setSimulatorSshSftpServer(currentSSHsftpServer); IsisFish.config.setSimulatorSshUsername(currentSSHUsername); IsisFish.config.setSSHPrivateKeyFilePath(currentSSHKey); @@ -331,6 +343,16 @@ onKeyReleased="doCheck()" /> </cell> </row> + <row> + <cell> + <JLabel id='sshSftpServerLabel' text='isisfish.config.main.simulation.ssh.sftpserver' + toolTipText='isisfish.config.main.simulation.ssh.sftpserver' /> + </cell> + <cell fill='horizontal' columns="2"> + <JTextField id='sshSftpServerField' toolTipText='isisfish.config.main.simulation.ssh.sftpserver' + onKeyReleased="doCheck()" /> + </cell> + </row> <row fill='horizontal'> <cell> <JLabel id='usernameLabel' text='isisfish.config.main.simulation.ssh.username' 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-10-27 13:20:18 UTC (rev 2702) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-10-27 17:02:59 UTC (rev 2703) @@ -180,6 +180,8 @@ isisfish.config.main.simulation.ssh.pbsbinpath.description=PBS executables (qsub, qdel...) directory isisfish.config.main.simulation.ssh.server=Server address isisfish.config.main.simulation.ssh.server.description=Server adress +isisfish.config.main.simulation.ssh.sftpserver=Tranfert server +isisfish.config.main.simulation.ssh.sftpserver.description=Transfert server adress isisfish.config.main.simulation.ssh.tmppath=Server temp directory isisfish.config.main.simulation.ssh.tmppath.description=Server temp directory isisfish.config.main.simulation.ssh.userhome=User home directory 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-10-27 13:20:18 UTC (rev 2702) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-10-27 17:02:59 UTC (rev 2703) @@ -180,6 +180,8 @@ isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur isisfish.config.main.simulation.ssh.server=Adresse du serveur isisfish.config.main.simulation.ssh.server.description=Adresse du serveur +isisfish.config.main.simulation.ssh.sftpserver=Serveur de fichier +isisfish.config.main.simulation.ssh.sftpserver.description=Adresse du serveur de transfert de fichier isisfish.config.main.simulation.ssh.tmppath=Dossier temporaire isisfish.config.main.simulation.ssh.tmppath.description=Emplacement du dossier temporaire isisfish.config.main.simulation.ssh.userhome=R\u00E9pertoire d'accueil

1 0

r2702 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 27 Oct '09

27 Oct '09

Author: chatellier Date: 2009-10-27 13:20:18 +0000 (Tue, 27 Oct 2009) New Revision: 2702 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java Log: Set no output to h2 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-10-27 11:03:36 UTC (rev 2701) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-10-27 13:20:18 UTC (rev 2702) @@ -66,7 +66,7 @@ // Levels: 0=off, 1=error, 2=info, 3=debug. "TRACE_LEVEL_FILE=0;" + // on system.out: 0=off, 1=error, 2=info, 3=debug. - "TRACE_LEVEL_SYSTEM_OUT=1"; + "TRACE_LEVEL_SYSTEM_OUT=0"; protected static final String H2_URL = "jdbc:h2:file:%s;" +

1 0