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

r2176 - in isis-fish/trunk/src/main/assembly: . x86
by chatellier＠users.labs.libre-entreprise.org May 4, 2009

May 4, 2009

Author: chatellier Date: 2009-05-04 19:31:22 +0000 (Mon, 04 May 2009) New Revision: 2176 Added: isis-fish/trunk/src/main/assembly/x86/ isis-fish/trunk/src/main/assembly/x86/jri.dll isis-fish/trunk/src/main/assembly/x86/libjri.so Modified: isis-fish/trunk/src/main/assembly/bin.xml Log: Refactor bin assembly. Add jri (so & dll) in assembly archive. Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2009-05-04 19:29:24 UTC (rev 2175) +++ isis-fish/trunk/src/main/assembly/bin.xml 2009-05-04 19:31:22 UTC (rev 2176) @@ -3,7 +3,6 @@ <formats> <format>zip</format> </formats> - <includeBaseDirectory>false</includeBaseDirectory>  <fileSets> - <fileSet> <directory>target/lib</directory> - <outputDirectory>isis-fish-${project.version}/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <includes> <include>*.jar</include> </includes> </fileSet> - - <fileSet> +  <fileSet> - <outputDirectory>isis-fish-${project.version}</outputDirectory> <includes> <include>README*</include> <include>LICENSE*</include> </includes> </fileSet> - <fileSet> <directory>src/main/assembly</directory> + <outputDirectory></outputDirectory> <filtered>true</filtered> - <outputDirectory>isis-fish-${project.version}</outputDirectory> <fileMode>0755</fileMode> <includes> <include>go.sh</include> <include>go.bat</include> </includes> </fileSet> - </fileSets> + + <files> + <file> + <source>target/${artifact.artifactId}-${artifact.version}.jar</source> + </file> + <file> + <source>src/main/assembly/x86/jri.dll</source> + </file> + <file> + <source>src/main/assembly/x86/libjri.so</source> + </file> + </files> </assembly> \ No newline at end of file Added: isis-fish/trunk/src/main/assembly/x86/jri.dll =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x86/jri.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/assembly/x86/libjri.so =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x86/libjri.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

1 0

r2175 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org May 4, 2009

May 4, 2009

Author: chatellier Date: 2009-05-04 19:29:24 +0000 (Mon, 04 May 2009) New Revision: 2175 Modified: isis-fish/trunk/pom.xml Log: Licence always changed in release phase Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-05-04 18:02:50 UTC (rev 2174) +++ isis-fish/trunk/pom.xml 2009-05-04 19:29:24 UTC (rev 2175) @@ -585,7 +585,7 @@ <execution> <id>attach-licenses</id> <goals> - <goal>license</goal> +  <goal>third-party</goal> </goals> </execution>

1 0

r2174 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org May 4, 2009

May 4, 2009

Author: chatellier Date: 2009-05-04 18:02:50 +0000 (Mon, 04 May 2009) New Revision: 2174 Modified: isis-fish/trunk/pom.xml Log: Update versions Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-05-04 12:44:11 UTC (rev 2173) +++ isis-fish/trunk/pom.xml 2009-05-04 18:02:50 UTC (rev 2174) @@ -8,12 +8,12 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5</version> </parent> <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.4-rc4-SNAPSHOT</version> + <version>3.2.0.4-SNAPSHOT</version>  <dependencies> @@ -342,17 +342,17 @@ <topia.version>2.1.4</topia.version> <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.3</lutinmatrix.version> - <lutinutil.version>1.0.5-SNAPSHOT</lutinutil.version> + <lutinutil.version>1.0.5</lutinutil.version> <i18n.version>0.9</i18n.version> <lutinwidget.version>0.14</lutinwidget.version> <generator.version>0.64</generator.version> - <lutinj2r.version>0.4-SNAPSHOT</lutinj2r.version> + <lutinj2r.version>0.4</lutinj2r.version> <jrst.version>0.8.4</jrst.version> <license-switcher.version>0.6</license-switcher.version> <openmap.version>4.6.4</openmap.version> <aspectwerkz.version>2.0</aspectwerkz.version> <sshtool.version>0.2.2</sshtool.version> - <xmlrpc.version>3.1</xmlrpc.version> + <xmlrpc.version>3.1.2</xmlrpc.version>  <maven.test.forkMode>once</maven.test.forkMode>

1 0

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

May 4, 2009

Author: chatellier Date: 2009-05-04 12:44:11 +0000 (Mon, 04 May 2009) New Revision: 2173 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Remove introspection code to set topia id to null (was a bad idea) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-04 12:39:36 UTC (rev 2172) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-04 12:44:11 UTC (rev 2173) @@ -22,8 +22,6 @@ import static org.codelutin.i18n.I18n._; import java.io.File; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.net.MalformedURLException; import java.net.URL; import java.rmi.RemoteException; @@ -316,28 +314,6 @@ // forceReload, save all modification in parameter and reread it parameters = simulation.getForceReloadParameter(); - /* Temp disabled - // Rule modification - List<Rule> rules = parameters.getRules(); - for (Rule rule : rules) { - // FIXME fix hibernate bug - // org.hibernate.HibernateException: Found shared references to a collection - // to not have same loaded entity into different context ! - Field[] fields = rule.getClass().getFields(); - for (Field field : fields) { - if (Modifier.isPublic(field.getModifiers())) { - log.debug("change field is " + field.getName() - + "(set topiaId = null)"); - Object fieldValue = field.get(rule); - if (fieldValue instanceof TopiaEntity) { - TopiaEntity valueEntity = (TopiaEntity) fieldValue; - valueEntity.setTopiaId(null); - field.set(rule, valueEntity); - } - } - } - }*/ - // // Activation de l'OAP demandée //

1 0

r2172 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org May 4, 2009

May 4, 2009

Author: chatellier Date: 2009-05-04 12:39:36 +0000 (Mon, 04 May 2009) New Revision: 2172 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java Log: Fix table component size => pack result to huge window Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-05-04 10:28:26 UTC (rev 2171) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-05-04 12:39:36 UTC (rev 2172) @@ -229,8 +229,9 @@ <Table id='content' constraints='BorderLayout.CENTER'> <row> <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <JScrollPane> - <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' enabled='{isContinueSelected()}'/> + <JScrollPane preferredSize="{new Dimension(200, 150)}"> + <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' + enabled='{isContinueSelected()}' /> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-05-04 10:28:26 UTC (rev 2171) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-05-04 12:39:36 UTC (rev 2172) @@ -22,13 +22,11 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import javax.swing.JComponent; -import javax.swing.JDialog; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r2171 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 4, 2009

May 4, 2009

Author: chatellier Date: 2009-05-04 10:28:26 +0000 (Mon, 04 May 2009) New Revision: 2171 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Francisage de "Stopping simulation" 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-05-04 10:07:25 UTC (rev 2170) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-04 10:28:26 UTC (rev 2171) @@ -525,7 +525,7 @@ isisfish.launch.server.ssh.publicKeyFile=clef publique ssh isisfish.launch.ssh=lecture-\u00E9criture (ssh) isisfish.launch.start=Lancement Isis-fish... %1$s -isisfish.launch.stop=Stopping simulation... +isisfish.launch.stop=Arr\u00EAt de la simulation... isisfish.launching=after init done in %1$s. isisfish.log.addAppender=ajoute un appender [%1$s] isisfish.log.body=Message \u00E0 joindre

1 0

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

May 4, 2009

Author: chatellier Date: 2009-05-04 10:07:25 +0000 (Mon, 04 May 2009) New Revision: 2170 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix NPE Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-04 08:26:48 UTC (rev 2169) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-04 10:07:25 UTC (rev 2170) @@ -672,16 +672,18 @@ if (log.isDebugEnabled()) { log.debug("Call analyzeResult on sensitivity script " + sensitivityCalculator.getClass().getSimpleName()); } - try { - // build master sensitivity export directory - File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), simulationCommonPrefix); - // directory must already exists !!! - sensitivityCalculator.analyzeResult(simulationStorageForAnalyze, masterExportDirectory); - } - catch(SensitivityException e) { - if (log.isErrorEnabled()) { - log.error("Can't call analyse result", e); + if (sensitivityCalculator != null) { + try { + // build master sensitivity export directory + File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), simulationCommonPrefix); + // directory must already exists !!! + sensitivityCalculator.analyzeResult(simulationStorageForAnalyze, masterExportDirectory); } + catch(SensitivityException e) { + if (log.isErrorEnabled()) { + log.error("Can't call analyse result", e); + } + } } } }

1 0

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

May 4, 2009

Author: chatellier Date: 2009-05-04 08:26:48 +0000 (Mon, 04 May 2009) New Revision: 2169 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Disable setTopiaId(null) for test Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-03 18:31:42 UTC (rev 2168) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-04 08:26:48 UTC (rev 2169) @@ -316,6 +316,7 @@ // forceReload, save all modification in parameter and reread it parameters = simulation.getForceReloadParameter(); + /* Temp disabled // Rule modification List<Rule> rules = parameters.getRules(); for (Rule rule : rules) { @@ -335,7 +336,7 @@ } } } - } + }*/ // // Activation de l'OAP demandée

1 0

r2168 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 3, 2009

May 3, 2009

Author: chatellier Date: 2009-05-03 18:31:42 +0000 (Sun, 03 May 2009) New Revision: 2168 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 i18n 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-05-03 18:22:03 UTC (rev 2167) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-03 18:31:42 UTC (rev 2168) @@ -7,6 +7,7 @@ Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= +Can't\ download\ archive\ \:\ %s= Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= @@ -28,6 +29,7 @@ Create\ a\ new\ script= Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= +Error\ while\ downloading\ file\ \:\ %s= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= @@ -49,6 +51,7 @@ Region\ %s\ already\ inited= Remote\ IsisFish\ server= Remote\ control\ file\ doesn't\ exists\ %s= +Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= Save\ current\ script= Show\ help= @@ -901,6 +904,7 @@ isisfish.simulation.remote.message.connection=Connecting to Caparmor isisfish.simulation.remote.message.downloadresults=Downloading results isisfish.simulation.remote.message.upload=Uploading simulation +isisfish.simulation.remote.message.waitingavailable=Waiting for available resource. isisfish.simulation.remote.message.waitingstart=Waiting for simulation start isisfish.simulation.title=Simulation launcher isisfish.simulator.launcher.inprocess=in current process 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-05-03 18:22:03 UTC (rev 2167) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-03 18:31:42 UTC (rev 2168) @@ -7,6 +7,7 @@ Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= +Can't\ download\ archive\ \:\ %s= Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= @@ -28,6 +29,7 @@ Create\ a\ new\ script= Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= +Error\ while\ downloading\ file\ \:\ %s= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= @@ -49,6 +51,7 @@ Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e Remote\ IsisFish\ server= Remote\ control\ file\ doesn't\ exists\ %s= +Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= Save\ current\ script= Show\ help= @@ -901,6 +904,7 @@ isisfish.simulation.remote.message.connection=Connexion \u00E0 Caparmor isisfish.simulation.remote.message.downloadresults=T\u00E9l\u00E9chargement des r\u00E9sultats isisfish.simulation.remote.message.upload=Upload de la simulation +isisfish.simulation.remote.message.waitingavailable=Attente d'une place de simulation isisfish.simulation.remote.message.waitingstart=Attente du d\u00E9marrage de la simulation isisfish.simulation.title=Lanceur de simulation isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus @@ -1064,4 +1068,4 @@ minimum\ length= not\ started= region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= -simulate\ %s\ with\ file\ %s= \ No newline at end of file +simulate\ %s\ with\ file\ %s=

1 0

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

May 3, 2009

Author: chatellier Date: 2009-05-03 18:22:03 +0000 (Sun, 03 May 2009) New Revision: 2167 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Get simulation result tbz2 compressed. Global improvement. 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-05-03 18:21:25 UTC (rev 2166) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-03 18:22:03 UTC (rev 2167) @@ -40,7 +40,7 @@ import org.codelutin.util.FileUtil; import org.codelutin.util.MD5; import org.codelutin.util.MD5InputStream; -import org.codelutin.util.ZipUtil; +import org.codelutin.util.Tbz2Util; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -228,6 +228,7 @@ // ask for available resources on caparmor // blocking until available + message(control, _("isisfish.simulation.remote.message.waitingavailable")); simulationStarted(); // start ssh session @@ -241,7 +242,7 @@ String simulationRemotePath = uploadSimulation(sshSession, simulationZip); - String remoteResultZip = getRemoteResultZipPath(control.getId()); + String remoteResultZip = getRemoteResultArchivePath(control.getId()); // build du contenu du script message(control,_("isisfish.simulation.remote.message.waitingstart")); @@ -251,6 +252,8 @@ simulationRemotePath, remoteResultZip, simulationPreScriptPath); String scriptRemotePath = uploadSimulationScript(sshSession, simulationScript); + // prescrit uploaded, delete + simulationScript.delete(); addScriptToQsubQueue(sshSession, scriptRemotePath); @@ -276,8 +279,7 @@ // TODO change, now getSimulationStorage() // is common to all launchers - SimulationStorage simulationStorage = null; - simulationStorage = SimulationStorage + SimulationStorage simulationStorage = SimulationStorage .getSimulation(control.getId()); return simulationStorage; @@ -292,13 +294,21 @@ @Override public void updateControl(SimulationService simulationService, SimulationControl control) throws RemoteException { + + // make sure user is connected + try { + getSSHSession(); + } + catch(JSchException e) { + throw new RemoteException("Can't connect", e); + } try { // CONTROL file try { // download control file - File controlFile = downloadSimulationFile(control.getId(), + File controlFile = downloadControlFile(sshSession, control.getId(), SimulationStorage.CONTROL_FILENAME); if (log.isDebugEnabled()) { log.debug("Control have been downloaded : " @@ -332,7 +342,7 @@ // MD5 + SIMULATION zip file try { - File md5ControlFile = downloadMD5ControlFile(control.getId()); + File md5ControlFile = downloadResultsMD5File(sshSession, control.getId()); if (md5ControlFile != null) { control.setText(_("isisfish.simulation.remote.message.downloadresults")); @@ -343,9 +353,9 @@ log.debug("MD5 Control file have been downloaded : " + md5ControlFile.getAbsolutePath()); } - File resultZipFile = downloadZIPResults(sshSession, control.getId(), md5sum); + File resultArchiveFile = downloadResultsArchive(sshSession, control.getId(), md5sum); - if (resultZipFile != null) { + if (resultArchiveFile != null) { // FIXME done here to not break upload during import // FIXME je pense que les resources ne sont @@ -355,10 +365,10 @@ // FIXME too slow methods //SimulationStorage.importZip(resultZipFile); - ZipUtil.uncompress(resultZipFile, SimulationStorage.getSimulationDirectory()); + Tbz2Util.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); if (log.isDebugEnabled()) { - log.debug("Simulation imported : " + resultZipFile.getAbsolutePath()); + log.debug("Simulation imported : " + resultArchiveFile.getAbsolutePath()); } // read control from downloaded simulation @@ -366,7 +376,9 @@ SimulationStorage.readControl(control.getId(), control, "stop"); } - resultZipFile.delete(); + resultArchiveFile.delete(); + + // TODO remove remote md5 and zip } else { if (log.isWarnEnabled()) { @@ -380,7 +392,7 @@ } catch(SSHException e) { if (log.isDebugEnabled()) { - log.debug(_("Error while downloading file : %s", e.getMessage())); + log.debug(_("Can't download archive : %s", e.getMessage())); } } /*catch (TopiaException e) { if (log.isErrorEnabled()) { @@ -390,7 +402,7 @@ // INFORMATION file try { - File infoFile = downloadSimulationFile(control.getId(), + File infoFile = downloadControlFile(sshSession, control.getId(), SimulationStorage.INFORMATION_FILENAME); if (log.isDebugEnabled()) { log.debug("Information have been downloaded : " @@ -421,7 +433,7 @@ // file doesn't exist if (log.isDebugEnabled()) { // not add ,e plz :) - log.debug(_("Remote control file doesn't exists %s", e + log.debug(_("Remote information file doesn't exists %s", e .getMessage())); } } @@ -650,10 +662,10 @@ * @throws SSHException if download fail (can happen if remote file doesn't exist * @throws IOException if download fail (can happen if remote file doesn't exist */ - protected File downloadZIPResults(Session session, String simulationId, String md5sum) + protected File downloadResultsArchive(Session session, String simulationId, String md5sum) throws SSHException, IOException { - File localFile = File.createTempFile("simulation-results", ".zip"); + File localFile = File.createTempFile("simulation-results", ".tbz2"); if (log.isDebugEnabled()) { log.debug("Downloading results in " + localFile.getAbsolutePath()); @@ -661,13 +673,20 @@ // build remote file path // FIXME this path should be given by remote IsisFish app - String remoteFile = getRemoteResultZipPath(simulationId); + String remoteFile = getRemoteResultArchivePath(simulationId); - SSHUtils.scpFrom(session, remoteFile, localFile); + try { + SSHUtils.scpFrom(session, remoteFile, localFile); + } + catch(SSHException e) { + localFile.delete(); + throw e; + } if (!StringUtils.isEmpty(md5sum)) { MD5InputStream in = new MD5InputStream(new FileInputStream(localFile)); - while(in.read() != -1) {} + while(in.read() != -1) { + } in.close(); String localMd5 = MD5.asHex(in.hash()); if (!localMd5.equals(md5sum)) { @@ -686,13 +705,14 @@ * Download remote simulation control file and store its content into temp * file. * + * @param sshSession valid opened ssh session * @param simulationId id de la simulation * @param fileName nom du fichier a telecharger * @return downloaded temp file (file have to be manually deleted) * @throws IOException * @throws SSHException if remote file doesn't exists */ - protected File downloadSimulationFile(String simulationId, String fileName) + protected File downloadControlFile(Session sshSession, String simulationId, String fileName) throws IOException, SSHException { File localFile = null; @@ -709,9 +729,10 @@ localFile = File.createTempFile(simulationId, fileName); try { - SSHUtils.scpFrom(getSSHSession(), remoteFile, localFile); - } catch (JSchException e) { - throw new SSHException("Can't connect", e); + SSHUtils.scpFrom(sshSession, remoteFile, localFile); + } catch (SSHException e) { + localFile.delete(); + throw e; } return localFile; @@ -721,26 +742,26 @@ * Download remote simulation md5 control file and store its content into temp * file. * + * @param sshSession valid opened ssh session * @param simulationId id de la simulation * @return downloaded temp file (file have to be manually deleted) * @throws IOException * @throws SSHException if remote file doesn't exists */ - protected File downloadMD5ControlFile(String simulationId) + protected File downloadResultsMD5File(Session sshSession, String simulationId) throws IOException, SSHException { - File localFile = null; - // build remote file path - String remoteFile = getRemoteResultZipPath(simulationId) + ".md5"; + String remoteFile = getRemoteResultArchivePath(simulationId) + ".md5"; // local tmp file - localFile = File.createTempFile(simulationId, ".md5"); + File localFile = File.createTempFile(simulationId, ".md5"); try { - SSHUtils.scpFrom(getSSHSession(), remoteFile, localFile); - } catch (JSchException e) { - throw new SSHException("Can't download file", e); + SSHUtils.scpFrom(sshSession, remoteFile, localFile); + } catch (SSHException e) { + localFile.delete(); + throw e; } return localFile; @@ -791,7 +812,7 @@ * @throws SSHException if upload fail * @throws IOException if upload fail */ - protected String getRemoteResultZipPath(String simulationId) + protected String getRemoteResultArchivePath(String simulationId) throws SSHException, IOException { String remotePath = IsisFish.config.getSimulatorSshTmpPath(); @@ -801,7 +822,7 @@ remotePath += "/"; } - remotePath += "simulation-" + simulationId + "-result.zip"; + remotePath += "simulation-" + simulationId + "-result.tbz2"; return remotePath; } @@ -871,7 +892,7 @@ protected File getLaunchSimulationScriptFile(String simuationId, String simulationZip, String simulationResultZip, String preScriptPath) throws IOException { - File tempScript = File.createTempFile("isis-launch-", ".seq"); + File tempScript = File.createTempFile("isis-launch-" + simuationId + "-", ".seq"); tempScript.deleteOnExit(); // auto delete String fileContent = getSimulationScriptLaunchContent(

1 0