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

r2821 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity: . visitor
by chatellier＠users.labs.libre-entreprise.org Dec. 11, 2009

Dec. 11, 2009

Author: chatellier Date: 2009-12-11 15:23:36 +0000 (Fri, 11 Dec 2009) New Revision: 2821 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java Log: Add package documentation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java 2009-12-11 13:56:56 UTC (rev 2820) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java 2009-12-11 15:23:36 UTC (rev 2821) @@ -1,5 +1,5 @@ /** - * Factors. + * Sensitivity analysis. * * Ce package contient les données {@link java.io.Serializable} * permettant de representer des Facteur de variation à appliquer @@ -9,4 +9,3 @@ * comme R (http://www.r-project.org/) ou autre. */ package fr.ifremer.isisfish.simulator.sensitivity; - Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java 2009-12-11 15:23:36 UTC (rev 2821) @@ -0,0 +1,4 @@ +/** + * XML import/export visitor. + */ +package fr.ifremer.isisfish.simulator.sensitivity.visitor; Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2820 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Dec. 11, 2009

Dec. 11, 2009

Author: chatellier Date: 2009-12-11 13:56:56 +0000 (Fri, 11 Dec 2009) New Revision: 2820 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/SimulationItem.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java Log: Update doc 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-12-11 13:41:02 UTC (rev 2819) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-12-11 13:56:56 UTC (rev 2820) @@ -67,13 +67,15 @@ * Isis-Fish must be installed on remote server. * * Caparmor file layout ($i = plan/as increment) : - * - $ISIS-TMP/simulation-$id-preparation.zip - * - $ISIS-TMP/simulation-$id-prescript.bsh - * - $ISIS-TMP/simulation-$id-script.seq - * - $ISIS-TMP/simulation-$id-result.zip - * - $ISIS-TMP/simulation-$id-result.zip.md5 - * - $ISIS-TMP/simulation-$id-output.txt - * - $ISIS-TMP/simulation-$id-pbs.id + * <ul> + * <li>$ISIS-TMP/simulation-$id-preparation.zip + * <li>$ISIS-TMP/simulation-$id-prescript.bsh + * <li>$ISIS-TMP/simulation-$id-script.seq + * <li>$ISIS-TMP/simulation-$id-result.zip + * <li>$ISIS-TMP/simulation-$id-result.zip.md5 + * <li>$ISIS-TMP/simulation-$id-output.txt + * <li>$ISIS-TMP/simulation-$id-pbs.id + * </ul> * * @see JSch * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-12-11 13:41:02 UTC (rev 2819) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-12-11 13:56:56 UTC (rev 2820) @@ -38,7 +38,7 @@ * les simulations sont indépendantes et peuvent être lancées groupées * ({@code true} par defaut) * <li>simulationStandaloneZip : si le fichier zip est different pour toute - * les simulations ou s'il peut être commun à un esemble de simulation + * les simulations ou s'il peut être commun à un ensemble de simulation * <li>simulationNumber : simulation number in non standalone simulation * <li>simulationsCount : total simulation count * <li>lastSimulation : last simulation in a simulation pool Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2009-12-11 13:41:02 UTC (rev 2819) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2009-12-11 13:56:56 UTC (rev 2820) @@ -2,10 +2,7 @@ * <h1>Isis fish simulation launchers.</h1> * * <h2>To do</h2> - * <li> voir pourquoi l'interface de visu des simulations en cours ne se - * rafraichi pas - * <li> supprimer le SimulationItem et tout mettre dans SimulationJob (reflechir - * si au niveau design c'est une bonne chose + * <ul> * <li> faire une interface graphique de monitoring des Executors (nombre de * threads actif, nombre de simulations terminer, nombre de simulation * explicitement pour cet executor, afficher l'etat pause/resume/error et @@ -17,7 +14,6 @@ * simulations. * <li> ajouter dans l'interface de vision des simulations en cours, de * modifier le launcher des simulations non lancee. - * <li> tester les differents launcher * <li> trouver une solution pour que les jobs soumis pour un launcher * particulier soit bien executer par l'executor de ce launcher. (penser au * changement de priority avec resoumission si ce choix est pris, c-a-d que le @@ -31,6 +27,7 @@ * job est directement soumis au bon executor soit ajoute a la queue general. * (ajouter un bool qui permette lors de report d'erreur de resoumettre un job * avec launcher fixe par l'utilisateur sur la queue general ou non. + * </ul> * * <h2>Architecture global</h2> * <img src="doc-files/isis-simulation.png" alt="archi"/>

1 0

r2819 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Dec. 11, 2009

Dec. 11, 2009

Author: chatellier Date: 2009-12-11 13:41:02 +0000 (Fri, 11 Dec 2009) New Revision: 2819 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java Log: Add parameters to know if a zip file can be common to multiples simulations (AS). Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-12-11 13:22:47 UTC (rev 2818) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-12-11 13:41:02 UTC (rev 2819) @@ -35,12 +35,19 @@ * <li>d'informations supplémentaires utiles à certains launcher : * <ul> * <li>standaloneSimulation : la simulation doit être lancée seule, sinon - * les simulations sont indépendantes et peuvent être lancées groupées. + * les simulations sont indépendantes et peuvent être lancées groupées + * ({@code true} par defaut) + * <li>simulationStandaloneZip : si le fichier zip est different pour toute + * les simulations ou s'il peut être commun à un esemble de simulation * <li>simulationNumber : simulation number in non standalone simulation * <li>simulationsCount : total simulation count + * <li>lastSimulation : last simulation in a simulation pool * </ul> * </ul> * + * Les valeurs par defaut sont positionnée de telle sorte qu'une simulation + * est considérée par defaut comme totalement indépendante. + * * @author poussin * @version $Revision$ * @@ -58,6 +65,13 @@ /** Le zip contenant la simulation prete a etre executee. */ protected File simulationZip; + /** + * Si vrai, le fichier zip n'est pas commun à un ensemble de simulations. + * + * Default to {@code true}. + */ + protected boolean standaloneSimulationZip = true; + /** Simulation prescript. */ protected String simulationPrescriptContent; @@ -75,7 +89,7 @@ protected int simulationNumber = -1; /** - * Last simulation. + * last simulation in a simulation pool. */ protected boolean lastSimulation; @@ -133,6 +147,20 @@ } /** + * @return the standaloneSimulationZip + */ + public boolean isStandaloneSimulationZip() { + return standaloneSimulationZip; + } + + /** + * @param standaloneSimulationZip the standaloneSimulationZip to set + */ + public void setStandaloneSimulationZip(boolean standaloneSimulationZip) { + this.standaloneSimulationZip = standaloneSimulationZip; + } + + /** * Get simulation prescript. * * @return the simulationPrescriptPath

1 0

r2818 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Dec. 11, 2009

Dec. 11, 2009

Author: chatellier Date: 2009-12-11 13:22:47 +0000 (Fri, 11 Dec 2009) New Revision: 2818 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java Log: Set empty string value to fix division by 0 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-12-11 11:27:03 UTC (rev 2817) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-12-11 13:22:47 UTC (rev 2818) @@ -61,13 +61,17 @@ private static Log log = LogFactory .getLog(SimulationServiceTableModel.class); + /** Columns names. */ protected final static String[] columnHeader = new String[] { - _("isisfish.queue.id"), _("isisfish.queue.plan"), - _("isisfish.queue.launcher"), _("isisfish.queue.status"), + _("isisfish.queue.id"), + _("isisfish.queue.plan"), + _("isisfish.queue.launcher"), + _("isisfish.queue.status"), _("isisfish.queue.progression"), }; - /** columns types */ - protected Class<?>[] columnClass = new Class[] { String.class, // id + /** Columns types. */ + protected Class<?>[] columnClass = new Class[] { + String.class, // id String.class, // analyse plan number String.class, // local, remote, batch String.class, // text @@ -201,7 +205,7 @@ // TODO IndexOutOfBoundException here // Concurrent problem ? - if(rowIndex >= jobs.size()) { + if (rowIndex >= jobs.size()) { return null; } @@ -252,14 +256,17 @@ break; case 4: JProgressBar pb = getProgressBar(job); - pb.setMaximum((int)control.getProgressMax()); - pb.setValue((int)control.getProgress()); + pb.setMaximum((int) control.getProgressMax()); + pb.setValue((int) control.getProgress()); // progress can be used for other things Date date = control.getDate(); if (date != null) { pb.setString(date.getMonth() + "/" + date.getYear()); } + else { + pb.setString(""); + } result = pb; break; }

1 0

r2817 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Dec. 11, 2009

Dec. 11, 2009

Author: chatellier Date: 2009-12-11 11:27:03 +0000 (Fri, 11 Dec 2009) New Revision: 2817 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java Log: Set default simulation number to -1 (non sens) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-12-10 18:25:19 UTC (rev 2816) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-12-11 11:27:03 UTC (rev 2817) @@ -72,7 +72,7 @@ /** * Simulation number in non standalone simulation. */ - protected int simulationNumber; + protected int simulationNumber = -1; /** * Last simulation.

1 0

r2816 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org Dec. 10, 2009

Dec. 10, 2009

Author: chatellier Date: 2009-12-10 18:25:19 +0000 (Thu, 10 Dec 2009) New Revision: 2816 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Revert comment config Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-10 18:21:01 UTC (rev 2815) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-10 18:25:19 UTC (rev 2816) @@ -849,7 +849,7 @@ // on supprime car non compatible, les valeurs par defaut sont tres bien "localSimulator", null, "vcs.databaseVersion", null, - //"vcs.hostName", null, + "vcs.hostName", null, "vcs.noPassPhrase", null, "vcs.remoteDatabase", null, "vcs.remotePath", null,

1 0

r2815 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui resources/i18n
by chatellier＠users.labs.libre-entreprise.org Dec. 10, 2009

Dec. 10, 2009

Author: chatellier Date: 2009-12-10 18:21:01 +0000 (Thu, 10 Dec 2009) New Revision: 2815 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.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: Add monitoring folder Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-10 17:00:49 UTC (rev 2814) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-10 18:21:01 UTC (rev 2815) @@ -244,8 +244,24 @@ return result; } - + /** + * Retourne le repertoire ou sont stockes les informations relatives + * aux simulations en cours. + * + * @return monitoring directory + */ + public File getMonitoringDirectory() { + File result = getOptionAsFile(Option.MONITORING_DIRECTORY.key); + + if (!result.exists()) { + result.mkdirs(); + } + + return result; + } + + /** * Get javadoc directory. * * Create directory if not exists. @@ -833,7 +849,7 @@ // on supprime car non compatible, les valeurs par defaut sont tres bien "localSimulator", null, "vcs.databaseVersion", null, - "vcs.hostName", null, + //"vcs.hostName", null, "vcs.noPassPhrase", null, "vcs.remoteDatabase", null, "vcs.remotePath", null, @@ -889,6 +905,7 @@ public static enum Option implements OptionDef { COMPILATION_DIRECTORY("compilation.directory", _("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), + MONITORING_DIRECTORY("monitoring.directory", _("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", _("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), CONFIG_FILE(CONFIG_FILE_NAME, _("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), BACKUP_DIRECTORY("backup.directory", _("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-12-10 17:00:49 UTC (rev 2814) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-12-10 18:21:01 UTC (rev 2815) @@ -112,6 +112,7 @@ IsisConfig.Option.CONFIG_FILE, IsisConfig.Option.DATABASE_DIRECTORY, IsisConfig.Option.COMPILATION_DIRECTORY, + IsisConfig.Option.MONITORING_DIRECTORY, IsisConfig.Option.JAVADOC_DIRECTORY, IsisConfig.Option.BACKUP_DIRECTORY, IsisConfig.Option.DEFAULT_EXPORT_DIRECTORY, 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-12-10 17:00:49 UTC (rev 2814) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-10 18:21:01 UTC (rev 2815) @@ -162,6 +162,7 @@ isisfish.config.main.localSimulator.description= isisfish.config.main.locale.description=user locale isisfish.config.main.login.description= +isisfish.config.main.monitoringDirectory.description=Folder containing all necessary information needed to restart simulation isisfish.config.main.password.description= isisfish.config.main.regionMap.description= isisfish.config.main.remoteCaparmor.description= 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-12-10 17:00:49 UTC (rev 2814) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-10 18:21:01 UTC (rev 2815) @@ -151,17 +151,18 @@ isisfish.config.main.defaultBackupDirectory.description=le r\u00E9pertoire o\u00F9 stocker les backups des donn\u00E9es isisfish.config.main.defaultExportDirectory.description=le r\u00E9pertoire o\u00F9 exporter les r\u00E9sultats des simulations isisfish.config.main.defaultExportNames.description=les noms des exports \u00E0 effectuer apr\u00E8s une simulation -isisfish.config.main.defaultMapFile.description=TODO +isisfish.config.main.defaultMapFile.description=noms de la carte par d\u00E9faut pour une base sans cartes isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter apr\u00E8s une simulation isisfish.config.main.defaultSimulator.description=le nom du simulateur par d\u00E9faut \u00E0 utiliser lors d'une simulation -isisfish.config.main.defaultTagValue.description=TODO +isisfish.config.main.defaultTagValue.description= isisfish.config.main.encoding.description=l'encoding du syst\u00E8me -isisfish.config.main.javadocDirectory.description= +isisfish.config.main.javadocDirectory.description=dossier de g\u00E9n\u00E9ration de la javadoc des scripts isisfish.config.main.javadocURL.description=l'url de la javadoc des scripts isisfish.config.main.launchUI.description= isisfish.config.main.localSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.login.description=le login pour se connecter au serveur de simulations distant +isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations isisfish.config.main.password.description=le mot de passe pour se connecter au serveur de simulations distant 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

1 0

r2814 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org Dec. 10, 2009

Dec. 10, 2009

Author: chatellier Date: 2009-12-10 17:00:49 +0000 (Thu, 10 Dec 2009) New Revision: 2814 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java Log: Remove xml-rpc client and server Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-12-10 16:58:27 UTC (rev 2813) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-12-10 17:00:49 UTC (rev 2814) @@ -21,8 +21,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.Hashtable; -import java.util.Map; import java.util.Properties; import org.apache.commons.logging.Log; @@ -48,7 +46,7 @@ private static Log log = LogFactory.getLog(SimulationControl.class); protected PropertyChangeSupport listeners = new PropertyChangeSupport(this); - protected boolean inUpdateFromHashtable = false; + protected boolean inUpdateFromProperties = false; protected transient SimulationStorage simulation = null; protected String id = null; @@ -60,9 +58,6 @@ protected long progress = 0; protected String text = ""; - /** @deprecated only used in isis xml-rpc server. */ - protected Map<String, Object> update = new Hashtable<String, Object>(); - /** * * @param id simulation id @@ -274,22 +269,6 @@ } /** - * Convert current object in hashtable representation, and clear hashtable - * that contains last modified field. - * - * @return object hashtable representation - * @deprecated only used in xml-rpc isis server - */ - public Hashtable<String, Object> getUpdateHashtable() { - Hashtable<String, Object> result = new Hashtable<String, Object>(update); - update.clear(); - - result.put("id", getId()); - - return result; - } - - /** * Met dans un Properties tous les champs * @return un Properties avec tous les champs */ @@ -315,7 +294,7 @@ * @param props new properties to update from */ public void updateFromProperties(Properties props) { - inUpdateFromHashtable = true; + inUpdateFromProperties = true; if (log.isTraceEnabled()) { log.trace("updateFromProperties properties = " + props.toString()); @@ -359,61 +338,15 @@ setText(text); } } finally { - inUpdateFromHashtable = false; + inUpdateFromProperties = false; } } - /** - * update current object from hashtable representation - * - * @deprecated only used in xml-rpc isis server - */ - public void updateFromHashtable(Hashtable<String, Object> h) { - inUpdateFromHashtable = true; - try { - if (h.containsKey("started")) { - boolean started = (Boolean) h.get("started"); - setStarted(started); - } - if (h.containsKey("running")) { - boolean running = (Boolean) h.get("running"); - setRunning(running); - } - if (h.containsKey("stop")) { - boolean stop = (Boolean) h.get("stop"); - setStopSimulationRequest(stop); - } - if (h.containsKey("date")) { - Date date = new Date((Integer) h.get("date")); - setDate(date); - } - if (h.containsKey("progressMax")) { - long progressMax = (Long) h.get("progressMax"); - setProgressMax(progressMax); - } - if (h.containsKey("progress")) { - long progress = (Long) h.get("progress"); - setProgress(progress); - } - if (h.containsKey("text")) { - String text = (String) h.get("text"); - setText(text); - } - } finally { - inUpdateFromHashtable = false; - } - } - /* * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ public void propertyChange(PropertyChangeEvent e) { - String property = e.getPropertyName(); - if (inUpdateFromHashtable) { - update.remove(property); - } else { - Object value = e.getNewValue(); - update.put(property, value); + if (!inUpdateFromProperties) { if (getSimulation() != null) { getSimulation().saveControl(this); }

1 0

r2813 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Dec. 10, 2009

Dec. 10, 2009

Author: chatellier Date: 2009-12-10 16:58:27 +0000 (Thu, 10 Dec 2009) New Revision: 2813 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java Modified: isis-fish/trunk/pom.xml Log: Remove xml-rpc client and server Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-12-10 15:07:57 UTC (rev 2812) +++ isis-fish/trunk/pom.xml 2009-12-10 16:58:27 UTC (rev 2813) @@ -145,28 +145,6 @@ <version>1.0.12</version> </dependency> -  - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> -  <dependency> <groupId>org.beanshell</groupId> Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-12-10 15:07:57 UTC (rev 2812) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-12-10 16:58:27 UTC (rev 2813) @@ -1,294 +0,0 @@ -/* *##% - * Copyright (C) 2007, 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.simulator; - -import static org.nuiton.i18n.I18n._; - -import java.io.File; -import java.io.IOException; -import java.util.Hashtable; -import java.util.Map; -import java.util.Vector; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.xmlrpc.XmlRpcException; -import org.apache.xmlrpc.XmlRpcHandler; -import org.apache.xmlrpc.XmlRpcRequest; -import org.apache.xmlrpc.XmlRpcRequestConfig; -import org.apache.xmlrpc.common.XmlRpcHttpRequestConfig; -import org.apache.xmlrpc.server.XmlRpcHandlerMapping; -import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException; -import org.apache.xmlrpc.server.XmlRpcServer; -import org.apache.xmlrpc.webserver.WebServer; -import org.nuiton.util.FileUtil; - -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; -import fr.ifremer.isisfish.simulator.launcher.SimulationItem; -import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; - -/** - * Cette classe permet de lancer un serveur XML-RPC qui attend des demandes - * de simulation. Il est ensuite possible de lui demander ou en est rendu - * une simulation. - * - * Created: Thu Aug 22 2002 - * - * @author <poussin at codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - * - * @deprecated since ... a long time this implementation is unmaintained. - */ -public class SimulatorServer implements XmlRpcHandler, XmlRpcHandlerMapping { // SimulatorServer - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(SimulatorServer.class); - - /** - * TODO dans SimulationControl ajouter une date de lancement de - * simulation. Si cette date est par exemple > 7 j on supprime - * automatiquement de simulationControls. Et on fait - * ce petit traitement a chaque connexion au serveur. - */ - protected Hashtable<String, SimulationControl> simulationControls = new Hashtable<String, SimulationControl>(); - - /* - * @see org.apache.xmlrpc.server.XmlRpcHandlerMapping#getHandler(java.lang.String) - */ - @Override - public XmlRpcHandler getHandler(String handler) - throws XmlRpcNoSuchHandlerException, XmlRpcException { - - if (log.isDebugEnabled()) { - log.debug("Request handler : " + handler); - } - - return this; - } - - /* - * @see org.apache.xmlrpc.XmlRpcHandler#execute(org.apache.xmlrpc.XmlRpcRequest) - */ - @Override - public Object execute(XmlRpcRequest request) throws XmlRpcException { - - /* - * Parametres: - * method les 2 noms de methodes possibles sont <b>simulate</b> pour - * commencer une nouvelle simulation, et <b>checkPoint</b> pour - * demander ou en est la simulation que l'utilisateur a demande. - * param params si la methode est <b>simulate</b>, il faut donnee l'id, - * et le zip de la simulation. Si la methode est <b>checkPoint</b> - * il faut redonner le meme id que pour le lancement de la - * simulation. - * user le login a utiliser pour pouvoir faire une simulation - * password le mot de passe - * si la methode est <b>simulate</b> retourne un objet - * {@link Simulation} Simulation sous forme XML. Si la - * methode est <b>checkPoint</b> retourne le nombre de mois simule. - */ - - String user = null; - String password = null; - - // get basic connection info - XmlRpcRequestConfig config = request.getConfig(); - if (config instanceof XmlRpcHttpRequestConfig) { - XmlRpcHttpRequestConfig httpConfig = (XmlRpcHttpRequestConfig) config; - user = httpConfig.getBasicUserName(); - password = httpConfig.getBasicPassword(); - } - - // TODO check authenticated users - - // get params - Vector params = new Vector(); - for (int index = 0; index < request.getParameterCount(); ++index) { - params.add(request.getParameter(index)); - } - - // launch requested method - String method = request.getMethodName(); - Object result = null; - try { - if ("simulate".equals(method)) { - result = new SimulatorServer().simulate(params); - } else if ("checkPoint".equals(method)) { - result = checkPoint(params); - } else { - throw new NoSuchMethodException("Erreur: la methode " + method - + " n'existe pas"); - } - } catch (Exception e) { - throw new XmlRpcException("Error during xmlrpc call", e); - } - - return result; - } - - /** - * Lance une nouvelle simulation - * - * @param params les parametres - * <li>String id de simulation - * <li>String xml de la base - * <li>HashTable nom : rule - * <li>HashTable nom : script - * <li>HashTable nom : export - * <li>HashTable SimulationParameter - * @return La simulation sous forme d'un fichier zip representé par byte[] - * @throws Exception - */ - protected Object simulate(Vector params) throws Exception { - // on creer une nouvelle simulation - if (params.size() < 2) { - throw new IllegalArgumentException("Mauvais nombre d'argument"); - } - - String id = (String) params.get(0); - File zip = FileUtil.byteToFile((byte[]) params.get(1)); - - SimulationControl control = new SimulationControl(id); - SimulationStorage simulation = null; - - simulationControls.put(id, control); - try { - SimulatorLauncher launcher = new InProcessSimulatorLauncher(); - SimulationItem item = new SimulationItem(control, null); - item.setSimulationZip(zip); - launcher.simulate(null, item); - // FIXME null - simulation = launcher.getSimulationStorage(null, control); - - zip = simulation.createZip(); - byte[] result = FileUtil.fileToByte(zip); - - return result; - } catch (Exception eee) { - log.warn(_("isisfish.error.during.simulation"), eee); - throw eee; - } finally { - simulationControls.remove(id); - if (simulation != null) { - simulation.delete(false); - } - } - } - - /** - * synchronized two SimulationControl (local and remote) - * - * @param params - * @return - * @throws Exception - */ - synchronized protected Object checkPoint(Vector params) throws Exception { - // on retourne a l'utilisateur on en est la simulation - if (params.size() < 1) { - throw new IllegalArgumentException("Mauvais nombre d'argument"); - } - - Hashtable<String, Object> args = new Hashtable<String, Object>(); - args.putAll((Map<String, Object>) params.get(0)); - - String id = (String) args.get("id"); - SimulationControl callback = (SimulationControl) simulationControls - .get(id); - - if (callback == null) { - throw new SimulatorServerBadIdException("Erreur: " + id - + " n'est pas un identifiant de simulation"); - } - - callback.updateFromHashtable(args); - - return callback.getUpdateHashtable(); - } - - // synchronized protected Object stop(Vector params) throws Exception { - // if (params.size() < 1) - // throw new IllegalArgumentException("Mauvais nombre d'argument"); - // - // String id = (String) params.get(0); - // SimulationControl callback = (SimulationControl) simulationControls - // .get(id); - // if (callback == null) - // throw new SimulationException("Erreur: " + id - // + " n'est pas un identifiant de simulation"); - // - // callback.stopSimulation(); - // - // return ""; - // } - - /** - * Method main permet de lancer un serveur de simulation sur une machine. - * - * @param args - */ - public static void main(String[] args) { - - try { - IsisFish.init(); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Can't ini IsisFish", e); - } - } - - System.out.println("Usage: SimulatorServer [port]"); - - int p = 9090; - - if (args.length > 0) { - try { - p = Integer.parseInt(args[0]); - } catch (NumberFormatException nfx) { - System.err.println("Error parsing port number: " + args[0]); - } - } - - // FIXME KeepAlive in xmlrpc 3.x ? - //XmlRpc.setKeepAlive(true); - - try { - WebServer webserver = new WebServer(p); - XmlRpcServer xmlRpcServer = webserver.getXmlRpcServer(); - - //xmlRpcServer.addHandler("$default", new SimulatorServer()); // 2.x - xmlRpcServer.setHandlerMapping(new SimulatorServer()); // 3.x - - webserver.start(); - System.out.println("Started web server on port " + p); - - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Error creating web server", e); - } - } - } - -} // SimulatorServer Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-12-10 15:07:57 UTC (rev 2812) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-12-10 16:58:27 UTC (rev 2813) @@ -1,262 +0,0 @@ -/* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ - -package fr.ifremer.isisfish.simulator.launcher; - -import static org.nuiton.i18n.I18n._; - -import java.io.File; -import java.net.URL; -import java.rmi.RemoteException; -import java.util.Hashtable; -import java.util.Vector; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.xmlrpc.client.XmlRpcClient; -import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; -import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory; -import org.nuiton.util.FileUtil; - -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.SimulationControl; - -/** - * Launch simulation on remote IsisFish server throw XML-RPC. - * - * @author poussin - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - * - * @deprecated Since ... a long time this implementation is unmaintained. - */ -public class IsisFishServerSimulationLauncher implements SimulatorLauncher { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory - .getLog(IsisFishServerSimulationLauncher.class); - - @Override - public void simulate(SimulationService simulationService, - SimulationItem simulationItem) throws RemoteException { - - SimulationControl control = simulationItem.getControl(); - File simulationZip = simulationItem.getSimulationZip(); - - String simulationId = control.getId(); - SimulationStorage simulation = null; - try { - simulation = SimulationStorage.importAndRenameZip(simulationZip, - simulationId); - simulation = remoteSimulate(control, simulation); - } catch (Exception eee) { - log.error(_("Can't do simulation %s", simulationId), eee); - // FIXME simulation allways null here - if (simulation != null) { - simulation.getInformation().setException(eee); - } - } - - // on retourne directement le simulation storage passe en argument - // car la simulation a ete faite avec - //return simulation; - - } - - @Override - public int maxSimulationThread() { - // TODO a rendre configurable - return 1; - } - - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#getCheckProgressionInterval() - */ - @Override - public int getCheckProgressionInterval() { - - // par defaut, pour les serveur xmlrpc 20 secondes - - int interval = 20; - return interval; - } - - /** - * execute la simulation en remote - * - * @param control le controleur de simulation, peut-etre null si on ne - * souhaite pas controler la simulation - * @param simulation la simulation a faire - * - * @return le storage après simulation - * @throws Exception pour toute erreur - */ - public SimulationStorage remoteSimulate(SimulationControl control, - SimulationStorage simulation) throws Exception { - // export en zip du storage - File zip = simulation.createZip(); - - if (control != null) { - // creation du thread de surveillance de la simulation distante - // qui sert a mettre a jour les valeurs de control - new SimulationCheckpointRemoteThread(control).start(); - } - - // envoie le zip au serveur de simulation - // appel synchrone pour attendre la fin de la simulation - // recuperation du zip de la simulation terminé - Vector<Object> a = new Vector<Object>(); - //fixme : on peut avori control à null ? - a.add(control.getId()); - a.add(FileUtil.fileToByte(zip)); - - // lancement de la simulation - //XmlRpcClient c = new XmlRpcClient(IsisFish.config.getSimulatorServer()); - //c.setBasicAuthentication(IsisFish.config.getSimulatorUsername(), - // IsisFish.config.getSimulatorPassword()); - - XmlRpcClientConfigImpl xmlrpcconfig = new XmlRpcClientConfigImpl(); - xmlrpcconfig - .setServerURL(new URL(IsisFish.config.getSimulatorServer())); - xmlrpcconfig.setBasicUserName(IsisFish.config.getSimulatorUsername()); - xmlrpcconfig.setBasicPassword(IsisFish.config.getSimulatorPassword()); - XmlRpcClient client = new XmlRpcClient(); - client.setTransportFactory(new XmlRpcCommonsTransportFactory(client)); - client.setConfig(xmlrpcconfig); - - byte[] callResult = (byte[]) client.execute("simulate", a); - - // ecriture du resultat dans un fichier - File tmpzip = FileUtil.byteToFile(callResult); - - // remplacement du storage local par le storage recu - simulation.closeStorage(); - simulation.delete(false); - SimulationStorage result; - result = SimulationStorage.importAndRenameZip(tmpzip, control.getId()); - return result; - } - - /** - * This thread is responsible to synchronized SimulationControl used localy with - * remote simulation control for remote simulation. - * - * This thread dead when {@link SimulationControl#isRunning()} is false - * - * @author poussin - */ - protected class SimulationCheckpointRemoteThread extends Thread { // SimulationCheckpointRemoteThread - - protected SimulationControl control = null; - int badId = 0; - - public SimulationCheckpointRemoteThread(SimulationControl control) { - this.control = control; - } - - public void run() { - int sleepTime = 2000; - while (true) { - try { - Thread.sleep(sleepTime); - - updateControl(control); - // on remet de le temps normal, vu que la connexion a reussi - sleepTime = 2000; - - if (!control.isRunning()) { - return; - } - - } catch (Exception eee) { - // on supporte 10 erreurs puis ensuite on quitte le thread. - if (badId++ > 10) { - log.error("Error !!! ", eee); - break; - } else { - // on a echouer sur une tentative, on allonge un - // peu le temps - sleepTime += 2000; - } - } - } - - } - - public void updateControl(SimulationControl control) throws Exception { - // essai l'ancienne etait en dur: "http://localhost:9090" - - XmlRpcClientConfigImpl xmlrpcconfig = new XmlRpcClientConfigImpl(); - xmlrpcconfig.setServerURL(new URL(IsisFish.config - .getSimulatorServer())); - xmlrpcconfig.setBasicUserName(IsisFish.config - .getSimulatorUsername()); - xmlrpcconfig.setBasicPassword(IsisFish.config - .getSimulatorPassword()); - XmlRpcClient client = new XmlRpcClient(); - client.setTransportFactory(new XmlRpcCommonsTransportFactory( - client)); - client.setConfig(xmlrpcconfig); - - Vector a = new Vector(); - a.add(control.getUpdateHashtable()); - Hashtable<String, Object> result = (Hashtable<String, Object>) client - .execute("checkPoint", a); - // on remet de le temps normal, vu que la connexion a reussi - control.updateFromHashtable(result); - } - } // SimulationCheckpointRemoteThread - - @Override - public String toString() { - return _("Remote IsisFish server"); - } - - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#getSimulationStorage(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.SimulationControl) - */ - @Override - public SimulationStorage getSimulationStorage( - SimulationService simulationService, SimulationControl control) - throws RemoteException { - return null; - } - - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#updateControl(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.SimulationControl) - */ - @Override - public void updateControl(SimulationService simulationService, - SimulationControl control) throws RemoteException { - - } - - /** - * {@inheritDoc} - * - * Do nothing (no restriction on xml rpc launcher). - */ - @Override - public void simulationStopRequest(SimulationJob job) { - - } -}

1 0

r2812 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: simulator/launcher util/ssh
by chatellier＠users.labs.libre-entreprise.org Dec. 10, 2009

Dec. 10, 2009

Author: chatellier Date: 2009-12-10 15:07:57 +0000 (Thu, 10 Dec 2009) New Revision: 2812 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java Log: Add progression monitor for ssh transfert 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-12-10 14:30:26 UTC (rev 2811) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-12-10 15:07:57 UTC (rev 2812) @@ -49,6 +49,7 @@ import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import fr.ifremer.isisfish.util.ssh.InvalidPassphraseException; +import fr.ifremer.isisfish.util.ssh.ProgressMonitor; import fr.ifremer.isisfish.util.ssh.SSHAgent; import fr.ifremer.isisfish.util.ssh.SSHException; import fr.ifremer.isisfish.util.ssh.SSHUserInfo; @@ -703,7 +704,8 @@ String remoteFile = getRemoteResultArchivePath(simulationId); try { - SSHUtils.scpFrom(session, remoteFile, localFile); + ProgressMonitor progress = new ControlProgressMonitor(simulationControl); + SSHUtils.scpFrom(session, remoteFile, localFile, progress); } catch(SSHException e) { localFile.delete(); @@ -725,6 +727,51 @@ } /** + * Redefine a custom progress monitor that update control. + */ + protected static class ControlProgressMonitor extends ProgressMonitor { + + /** Control to update. */ + protected SimulationControl control; + + /** + * Constructor with control. + * + * @param control control + */ + public ControlProgressMonitor(SimulationControl control) { + this.control = control; + } + + /* + * @see fr.ifremer.isisfish.util.ssh.ProgressMonitor#init(long) + */ + @Override + public void init(long max) { + super.init(max); + control.setProgressMax(initFileSize); + } + + /* + * @see fr.ifremer.isisfish.util.ssh.ProgressMonitor#count(long) + */ + @Override + public void count(long len) { + super.count(len); + control.setProgress(totalLength); + } + + /* + * @see fr.ifremer.isisfish.util.ssh.ProgressMonitor#end() + */ + @Override + public void end() { + super.end(); + control.setProgress(initFileSize); + } + } + + /** * Download remote simulation control file and store its content into temp * file. * Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java 2009-12-10 15:07:57 UTC (rev 2812) @@ -0,0 +1,50 @@ +/* *##% + * Copyright (C) 2009 Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.util.ssh; + +/** + * Progress monitor (sftp). + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ProgressMonitor { + + /** Size of file to download. */ + protected long initFileSize = 0; + + /** Current dowloaded length. */ + protected long totalLength = 0; + + public void init(long max) { + initFileSize = max; + totalLength = 0; + } + + public void count(long len) { + totalLength += len; + } + + public void end() { + + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" 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-12-10 14:30:26 UTC (rev 2811) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2009-12-10 15:07:57 UTC (rev 2812) @@ -238,11 +238,26 @@ * @param remoteFileName remote file name to download * @param localFile local file name to download into * - * @throws SSHException if transfer fail (include md5 control failed) + * @throws SSHException if transfer fail */ public static void scpFrom(Session session, String remoteFileName, File localFile) throws SSHException { + scpFrom(session, remoteFileName, localFile, null); + } + /** + * Download a local file from remote server and check md5sum. + * + * @param session opened valid jsch session + * @param remoteFileName remote file name to download + * @param localFile local file name to download into + * @param monitor progress monitor (can be null) + * + * @throws SSHException if transfer fail + */ + public static void scpFrom(Session session, String remoteFileName, + File localFile, ProgressMonitor monitor) throws SSHException { + String command = "scp -f -r \"" + remoteFileName + "\""; ChannelExec channel = null; @@ -257,7 +272,7 @@ channel.connect(); sendAck(out); - startRemoteCpProtocol(in, out, localFile); + startRemoteCpProtocol(in, out, localFile, monitor); } catch (IOException e) { throw new SSHException(e); } catch (JSchException e) { @@ -292,7 +307,7 @@ // scp protected static void startRemoteCpProtocol(InputStream in, - OutputStream out, File localFile) throws IOException, SSHException { + OutputStream out, File localFile, ProgressMonitor monitor) throws IOException, SSHException { File startFile = localFile; while (true) { // C0644 filesize filename - header for a regular file @@ -311,7 +326,7 @@ } String serverResponse = stream.toString("UTF-8"); if (serverResponse.charAt(0) == 'C') { - parseAndFetchFile(serverResponse, startFile, out, in); + parseAndFetchFile(serverResponse, startFile, out, in, monitor); } else if (serverResponse.charAt(0) == 'D') { startFile = parseAndCreateDirectory(serverResponse, startFile); sendAck(out); @@ -344,7 +359,7 @@ // scp protected static void parseAndFetchFile(String serverResponse, - File localFile, OutputStream out, InputStream in) + File localFile, OutputStream out, InputStream in, ProgressMonitor monitor) throws IOException, SSHException { int start = 0; int end = serverResponse.indexOf(" ", start + 1); @@ -355,29 +370,27 @@ log.debug("Receiving: " + filename + " : " + filesize); File transferFile = (localFile.isDirectory()) ? new File(localFile, filename) : localFile; - fetchFile(transferFile, filesize, out, in); + fetchFile(transferFile, filesize, out, in, monitor); waitForAck(in); sendAck(out); } // scp protected static void fetchFile(File localFile, long filesize, - OutputStream out, InputStream in) throws IOException { + OutputStream out, InputStream in, ProgressMonitor monitor) throws IOException { byte[] buf = new byte[BUFFER_SIZE]; sendAck(out); + // case were progression is requested + if (monitor != null) { + monitor.init(filesize); + } + // read a content of lfile FileOutputStream fos = new FileOutputStream(localFile); int length; long totalLength = 0; - // only track progress for files larger than 100kb in verbose mode - boolean trackProgress = filesize > HUNDRED_KILOBYTES; - // since filesize keeps on decreasing we have to store the - // initial filesize - long initFilesize = filesize; - int percentTransmitted = 0; - try { while (true) { length = in.read(buf, 0, (BUFFER_SIZE < filesize) ? BUFFER_SIZE @@ -392,15 +405,20 @@ break; } - if (trackProgress) { - percentTransmitted = trackProgress(initFilesize, - totalLength, percentTransmitted); + // case were progression is requested + if (monitor != null) { + monitor.count(length); } } } finally { fos.flush(); fos.close(); } + + // case were progression is requested + if (monitor != null) { + monitor.end(); + } } // scp @@ -444,13 +462,6 @@ byte[] buf = new byte[BUFFER_SIZE]; long totalLength = 0; - // only track progress for files larger than 100kb in verbose mode - boolean trackProgress = filesize > HUNDRED_KILOBYTES; - // since filesize keeps on decreasing we have to store the - // initial filesize - long initFilesize = filesize; - int percentTransmitted = 0; - try { while (true) { int len = fis.read(buf, 0, buf.length); @@ -459,11 +470,6 @@ } out.write(buf, 0, len); totalLength += len; - - if (trackProgress) { - percentTransmitted = trackProgress(initFilesize, - totalLength, percentTransmitted); - } } out.flush(); sendAck(out); @@ -476,7 +482,7 @@ /** * Progress monitor (sftp). */ - protected static class ProgressMonitor implements SftpProgressMonitor { + protected static class UtilsProgressMonitor implements SftpProgressMonitor { private long initFileSize = 0; private long totalLength = 0; private int percentTransmitted = 0; @@ -607,7 +613,7 @@ SftpProgressMonitor monitor = null; boolean trackProgress = totalLength > HUNDRED_KILOBYTES; if (trackProgress) { - monitor = new ProgressMonitor(); + monitor = new UtilsProgressMonitor(); } channel.get(remoteFile, localFile.getAbsolutePath(), monitor); } @@ -666,7 +672,7 @@ SftpProgressMonitor monitor = null; if (trackProgress) { - monitor = new ProgressMonitor(); + monitor = new UtilsProgressMonitor(); } channel.put(localFile.getAbsolutePath(), remotePath, monitor);

1 0