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

r2644 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 12:09:13 +0000 (Mon, 28 Sep 2009) New Revision: 2644 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Delete prescript on exit 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-09-28 09:52:02 UTC (rev 2643) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-09-28 12:09:13 UTC (rev 2644) @@ -868,6 +868,7 @@ File tempPreScriptFile = File.createTempFile("isis-" + simulationId + "-", ".prescript"); + tempPreScriptFile.deleteOnExit(); FileUtil.writeString(tempPreScriptFile, simulationPreScript); String localPath = tempPreScriptFile.getAbsolutePath();

1 0

r2643 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 09:52:02 +0000 (Mon, 28 Sep 2009) New Revision: 2643 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Force plan generator to close opened storage Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-28 08:36:49 UTC (rev 2642) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-28 09:52:02 UTC (rev 2643) @@ -807,6 +807,10 @@ nextJob.setLauncher(job.getLauncher()); nextJob.addPostAction(this); // pour l'appel des after des plans } + + // close context for plan generator + sim.closeStorage(); + // quoi qu'il arrive on supprime le repertoire temporaire if (!FileUtil.deleteRecursively(tmpDirectory)) { log.warn(_("isisfish.error.remove.directory", @@ -829,8 +833,15 @@ public SimulationJob next() { hasNext(); // pour etre sur qu'il a ete appele au moins une fois - SimulationJob result = nextJob; - nextJob = null; + SimulationJob result = null; + + // next est appelee par un autre thread concurrent + // via la methode finished(SimulationJob, SimulationStorage) + synchronized (this) { + result = nextJob; + nextJob = null; + } + return result; }

1 0

r2642 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Sep '09

28 Sep '09

Author: chatellier Date: 2009-09-28 08:36:49 +0000 (Mon, 28 Sep 2009) New Revision: 2642 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Remove resultFile at JVM shutdown. 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-09-28 07:44:29 UTC (rev 2641) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-09-28 08:36:49 UTC (rev 2642) @@ -691,6 +691,10 @@ /** * Download simulation zip results. * + * MD5 control check sum if done, return null, if checkSum fail. + * + * File if configured to auto delete at JVM shutdown. + * * @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 */ @@ -698,6 +702,7 @@ throws SSHException, IOException { File localFile = File.createTempFile("simulation-results", ".zip"); + localFile.deleteOnExit(); if (log.isDebugEnabled()) { log.debug("Downloading results in " + localFile.getAbsolutePath());

1 0

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

28 Sep '09

Author: chatellier Date: 2009-09-28 07:44:29 +0000 (Mon, 28 Sep 2009) New Revision: 2641 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Fix some debug log message Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-09-21 08:19:24 UTC (rev 2640) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-09-28 07:44:29 UTC (rev 2641) @@ -679,7 +679,7 @@ public Object removeSelectivity(Gear gear, Selectivity selectivity) { if (log.isTraceEnabled()) { - log.trace("removeTargetSpecies called: " + selectivity); + log.trace("removeSelectivity called: " + selectivity); } try { if (gear != null && selectivity != null) { @@ -718,9 +718,9 @@ return null; } - public Object removeSeasonInfo(Metier metier, MetierSeasonInfo info) { + /*public Object removeSeasonInfo(Metier metier, MetierSeasonInfo info) { if (log.isTraceEnabled()) { - log.trace("createSeasonInfo called"); + log.trace("removeSeasonInfo called"); } try { metier.removeMetierSeasonInfo(info); @@ -733,7 +733,7 @@ showMsgBox(eee); } return null; - } + }*/ public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, Species species, String targetFactorEquationContent, boolean primaryCatch) { @@ -815,7 +815,7 @@ public Object removeEffortDescription(SetOfVessels sov, EffortDescription effort) { if (log.isTraceEnabled()) { - log.trace("remove called"); + log.trace("removeEffortDescription called"); } try { sov.removePossibleMetiers(effort); @@ -845,7 +845,7 @@ public Population createPopulation(TopiaContext context, Species species) { if (log.isTraceEnabled()) { - log.trace("create called"); + log.trace("createPopulation called"); } try { String name = "Population_new"; @@ -906,7 +906,7 @@ public void removePopulationSeasonInfo(Population pop, PopulationSeasonInfo populationSeasonInfo) { if (log.isDebugEnabled()) { - log.debug("removeSeasonInfo called"); + log.debug("removePopulationSeasonInfo called"); } try { pop.removePopulationSeasonInfo(populationSeasonInfo); @@ -922,7 +922,7 @@ public void createMetierSeasonInfo(Metier metier) { if (log.isDebugEnabled()) { - log.debug("createSeasonInfo called"); + log.debug("createMetierSeasonInfo called"); } try { MetierSeasonInfoDAO metierSeasonInfoPS = IsisFishDAOHelper @@ -942,7 +942,7 @@ public void removeMetierSeasonInfo(Metier metier, MetierSeasonInfo info) { if (log.isDebugEnabled()) { - log.debug("createSeasonInfo called"); + log.debug("removeMetierSeasonInfo called"); } try { metier.removeMetierSeasonInfo(info); @@ -957,7 +957,7 @@ public Object createRecruitmentDistribution(Population pop) { if (log.isTraceEnabled()) { - log.trace("createRecruitmentDistributionontext called: " + pop); + log.trace("createRecruitmentDistributionon called: " + pop); } try { String val = JOptionPane

1 0

r2640 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 21 Sep '09

21 Sep '09

Author: chatellier Date: 2009-09-21 08:19:24 +0000 (Mon, 21 Sep 2009) New Revision: 2640 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Modification de l'instanciation des plans pour prendre en compte les regles additionnelles. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-18 14:13:42 UTC (rev 2639) +++ isis-fish/trunk/changelog.txt 2009-09-21 08:19:24 UTC (rev 2640) @@ -1,5 +1,7 @@ isis-fish (3.2.0.7) stable; urgency=low + * Modify analyze plans starting to take extra rules + * Set ssh key in autorized_keys when connected with password * Isis now start with 1Go of allocated memory * Fix strategies/population selection on old simulation reloading * Always use logger for force writing in debug.txt file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-18 14:13:42 UTC (rev 2639) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-09-21 08:19:24 UTC (rev 2640) @@ -373,13 +373,20 @@ job.setLauncher(launcher); fireStartEvent(job); + // Attention, dans le cas d'un plan d'analyse, le new PrepareSimulationJob + // doit etre fait AVANT de faire le prepareSimulationZipFile + // car, il est possible que l'init des plans ajoute des regles !!! + PrepareSimulationJob task = null; + if (param.getUseAnalysePlan()) { + task = new PrepareSimulationJob(this, job); + } + // on construit le zip de la simulation File zip = prepareSimulationZipFile(control, param, null, true); item.setSimulationZip(zip); if (param.getUseAnalysePlan() && param.isIndependentPlan()) { // c un plan d'analyse independant, on construit toute les sous simu - Runnable task = new PrepareSimulationJob(this, job); subSimulationComputationExecutor.execute(task); } else { // l'item est fini d'etre initialise, on peut l'ajouter a la queue @@ -405,6 +412,7 @@ SensitivityCalculator sensitivitycalculator, DesignPlan designPlan) { try { + // build master sensitivity export directory File masterExportDirectory = new File(IsisFish.config.getDefaultExportDirectory(), id); if (!masterExportDirectory.isDirectory()) { @@ -448,12 +456,10 @@ // build new simulation id String subsimulationId = id + "_" + simulationIndex; - SimulationControl realSimulationControl = new SimulationControl( - subsimulationId); + SimulationControl realSimulationControl = new SimulationControl(subsimulationId); // new item, with zip - SimulationItem item = new SimulationItem(realSimulationControl, - subParam); + SimulationItem item = new SimulationItem(realSimulationControl, subParam); item.setSimulationZip(zip); SimulationJob job = new SimulationJob(this, item, priority); @@ -789,17 +795,6 @@ doNext = result; if (result) { - // FIXME si les plan d'analyse ajoute des regles - // on doit les copier - // copie de toutes regles a utiliser - List<Rule> rules = param.getRules(); - for (Rule rule : rules) { - String name = RuleStorage.getName(rule); - FileUtil.copy(new File(RuleStorage.getRuleDirectory(), name + ".java"), - new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); - } - // end FIXME copies des regles ajoutées - File zip = sim.createZip(); SimulationControl childControl = new SimulationControl( simId);

1 0

r2639 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 18 Sep '09

18 Sep '09

Author: chatellier Date: 2009-09-18 14:13:42 +0000 (Fri, 18 Sep 2009) New Revision: 2639 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Add comment about addExtraRule Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-18 13:51:01 UTC (rev 2638) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-09-18 14:13:42 UTC (rev 2639) @@ -542,6 +542,9 @@ /** * Add extra rules. * + * Appelé par les plan d'analyse, pour ajouter des regles supplémentaires + * dans être integrés au zip. + * * @param extraRules extra rules to add */ public void addExtraRules(String... extraRules) {

1 0

r2638 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: simulator/launcher util/ssh
by chatellier＠users.labs.libre-entreprise.org 18 Sep '09

18 Sep '09

Author: chatellier Date: 2009-09-18 13:51:01 +0000 (Fri, 18 Sep 2009) New Revision: 2638 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/SSHUserInfo.java Log: Remember given ssh password 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-09-18 10:10:58 UTC (rev 2637) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-09-18 13:51:01 UTC (rev 2638) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2008, 2009 Code Lutin + * Copyright (C) 2008, 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,7 +38,6 @@ import java.util.concurrent.Semaphore; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import java.util.zip.ZipInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -46,7 +45,6 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; import org.codelutin.util.MD5; -import org.codelutin.util.MD5InputStream; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; 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-09-18 10:10:58 UTC (rev 2637) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2009-09-18 13:51:01 UTC (rev 2638) @@ -171,6 +171,10 @@ response = new String[prompt.length]; for (int i = 0; i < prompt.length; i++) { response[i] = texts[i].getText(); + // hack to save + if (texts[i] instanceof JPasswordField) { + passwd = response[i]; + } } } // else = cancel

1 0

r2637 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/script src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 18 Sep '09

18 Sep '09

Author: chatellier Date: 2009-09-18 10:10:58 +0000 (Fri, 18 Sep 2009) New Revision: 2637 Modified: isis-fish/trunk/TODO.txt isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.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: Finish script UI translation Modified: isis-fish/trunk/TODO.txt =================================================================== --- isis-fish/trunk/TODO.txt 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/TODO.txt 2009-09-18 10:10:58 UTC (rev 2637) @@ -1,10 +1,11 @@ -TODO au 22/12/2008 +TODO au 18/09/2009 ================== - refaire les UI des résultats - - tester que les paramêtres d'une simulation - sont corrects - (ex:detection qu'il n'y a pas de strategie) - - modification des configurations des paths - pour les lancements à distance (caparmor...) - - simulation path... \ No newline at end of file + - tester que les paramêtres d'une simulation sont corrects + (ex:année < 0) + - Pouvoir modifier les facteurs apres avoir recharger une simulation + - valeur par defaut dans les champs de saisie + - JavaWebStart + - Synchronisation des script utilisateur (ecriture) + - Voir une version antérieure d'un script \ No newline at end of file Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/changelog.txt 2009-09-18 10:10:58 UTC (rev 2637) @@ -1,5 +1,6 @@ isis-fish (3.2.0.7) stable; urgency=low + * Isis now start with 1Go of allocated memory * Fix strategies/population selection on old simulation reloading * Always use logger for force writing in debug.txt file * Instantiate simulation parameters objects only when needed (to work on caparmor) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-09-18 10:10:58 UTC (rev 2637) @@ -365,19 +365,19 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JComboBox id="ScriptTypeChoice" model='{new DefaultComboBoxModel(getContextValue(ScriptAction.class).getScriptTypesNames())}'/> - <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='Create a new script' onActionPerformed='newScript()'/> - <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="Save current script" enabled='false' onActionPerformed='saveScript()'/> - <JButton id="buttonScriptExport" text="isisfish.script.txtExport" toolTipText="Export selected script(s) to zip archive" enabled='false' onActionPerformed='exportScript()'/> - <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="Commit script to CVS server" enabled='false' onActionPerformed='commitScript()'/> - <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="Cut current selection (Ctrl-x)" enabled='false' onActionPerformed='cut()'/> - <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="Copy current selection (Ctrl-c)" enabled='false' onActionPerformed='copy()'/> - <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="Paste current selection (Ctrl-v)" enabled='false' onActionPerformed='paste()'/> - <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="Check syntax of the current script" enabled='false' onActionPerformed='checkScript()'/> - <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="Try to eval current script (must be have main method)" enabled='false' onActionPerformed='evaluateScript()'/> + <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='newScript()'/> + <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='false' onActionPerformed='saveScript()'/> + <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='exportScript()'/> + <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='false' onActionPerformed='commitScript()'/> + <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='false' onActionPerformed='cut()'/> + <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='false' onActionPerformed='copy()'/> + <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='false' onActionPerformed='paste()'/> + <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='false' onActionPerformed='checkScript()'/> + <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='false' onActionPerformed='evaluateScript()'/> </JPanel> <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JScrollPane> - <javax.swing.JTree id="tree" name="tree" rootVisible="false" model='{getTreeModel()}'/> + <javax.swing.JTree id="tree" name="tree" rootVisible="false" model='{getTreeModel()}' /> </JScrollPane> <JSplitPane oneTouchExpandable="true" resizeWeight="0.75" orientation="VERTICAL"> <org.codelutin.widget.editor.Editor id='editor'/> 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-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-18 10:10:58 UTC (rev 2637) @@ -20,17 +20,11 @@ Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= -Check\ syntax\ of\ the\ current\ script= Checkout\ pom.xml\ to\ %s= Command\ '%s'\ fail\ to\ execute= -Commit\ script\ to\ CVS\ server= -Copy\ current\ selection\ (Ctrl-c)= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= -Create\ a\ new\ script= -Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= -Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= @@ -43,7 +37,6 @@ Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= -Paste\ current\ selection\ (Ctrl-v)= Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited= @@ -51,15 +44,12 @@ Remote\ control\ file\ doesn't\ exists\ %s= Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= -Save\ current\ script= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= -Stop\ the\ process= SubProcess\ start\:\ %s\ %s= Switch\ repository\ type\ to\ none= -Try\ to\ eval\ current\ script\ (must\ be\ have\ main\ method)= Try\ to\ log\ on\ %s@%s\:%d= Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= @@ -139,7 +129,6 @@ isisfish.common.season=Season isisfish.common.setOfVessels=Set of vessels isisfish.common.simulate=Simulate -isisfish.common.stop=Stop isisfish.common.strategies=Strategies isisfish.common.sum=Sum isisfish.common.tag=Tag @@ -633,7 +622,6 @@ isisfish.message.script.commit=Enter commit message isisfish.message.setting.cache.aspects=Setting Cache aspects isisfish.message.setting.trace.aspects=Setting Trace aspects -isisfish.message.simulation.after=Result exports isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Preparing simulation @@ -849,17 +837,21 @@ isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=Check +isisfish.script.check.tooltip=Check syntax of the current script isisfish.script.commit=Commit +isisfish.script.commit.tooltip=Commit script to SVN server isisfish.script.compilation.failed=%s isisfish.script.compilation.ok=Compilation complete.\n---------------------\n\n%s isisfish.script.copy=Copy +isisfish.script.copy.tooltip=Copy current selection (Ctrl-c) isisfish.script.cut=Cut +isisfish.script.cut.tooltip=Cut current selection (Ctrl-x) isisfish.script.evaluate=Evaluate -isisfish.script.export=Export script to archive -isisfish.script.export.cancel=Cancel +isisfish.script.evaluate.tooltip=Try to eval current script (must be have main() method) +isisfish.script.export=Export isisfish.script.export.checkAll=(Un)Check all scripts isisfish.script.export.chooseDir=... -isisfish.script.export.export=Export +isisfish.script.export.tooltip=Export selected script(s) to zip archive isisfish.script.export.tooltip.checkAll=(Un)Check all scripts to export isisfish.script.export.tooltip.chooseDir=Choose directory to export script to isisfish.script.import=Import scripts from archive @@ -900,10 +892,12 @@ isisfish.script.menu.txtVCS=Server isisfish.script.menu.update=Update from server isisfish.script.new=New +isisfish.script.new.tooltip=Create new script isisfish.script.paste=Paste +isisfish.script.paste.tooltip=Paste current selection (Ctrl-v) isisfish.script.save=Save +isisfish.script.save.tooltip=Sauve le script isisfish.script.title=Script Editor -isisfish.script.txtExport=Export isisfish.season.toString=season %1$s-%2$s isisfish.selectivity.equation=Equation isisfish.selectivity.selectPopulation=Select a population 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-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-18 10:10:58 UTC (rev 2637) @@ -20,17 +20,11 @@ Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= -Check\ syntax\ of\ the\ current\ script= Checkout\ pom.xml\ to\ %s= Command\ '%s'\ fail\ to\ execute= -Commit\ script\ to\ CVS\ server= -Copy\ current\ selection\ (Ctrl-c)= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= -Create\ a\ new\ script= -Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= -Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= @@ -43,7 +37,6 @@ Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= -Paste\ current\ selection\ (Ctrl-v)= Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e @@ -51,15 +44,12 @@ Remote\ control\ file\ doesn't\ exists\ %s= Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= -Save\ current\ script= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= -Stop\ the\ process= SubProcess\ start\:\ %s\ %s= Switch\ repository\ type\ to\ none= -Try\ to\ eval\ current\ script\ (must\ be\ have\ main\ method)= Try\ to\ log\ on\ %s@%s\:%d= Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= @@ -139,7 +129,6 @@ isisfish.common.season=Saison isisfish.common.setOfVessels=Flottille isisfish.common.simulate=Simuler -isisfish.common.stop=Arr\u00EAter isisfish.common.strategies=Strat\u00E9gies isisfish.common.sum=somme isisfish.common.tag=Tag @@ -633,7 +622,6 @@ isisfish.message.script.commit=Indiquez vos modifications isisfish.message.setting.cache.aspects=Mise en place des aspects Cache isisfish.message.setting.trace.aspects=Mise en place des aspects Trace -isisfish.message.simulation.after=Export des r\u00E9sultats isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation @@ -849,17 +837,21 @@ isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=V\u00E9rifier +isisfish.script.check.tooltip=V\u00E9rifie la synthaxe du script isisfish.script.commit=Commit +isisfish.script.commit.tooltip=Committer le script sur le serveur SVN isisfish.script.compilation.failed=%s isisfish.script.compilation.ok=Compilation r\u00E9ussie.\n--------------------\n\n%s isisfish.script.copy=Copier +isisfish.script.copy.tooltip=Copier la s\u00E9lection courante (Ctrl-c) isisfish.script.cut=Couper +isisfish.script.cut.tooltip=Couper la s\u00E9lection courante (Ctrl-x) isisfish.script.evaluate=\u00C9valuer -isisfish.script.export=Exporter des scripts dans une archive zip -isisfish.script.export.cancel=Annuler +isisfish.script.evaluate.tooltip=Lance le script (doit contenir un methode main() pour fonctionner) +isisfish.script.export=Exporter isisfish.script.export.checkAll=Tout (d\u00E9-)s\u00E9lectionner isisfish.script.export.chooseDir=... -isisfish.script.export.export=Exporter +isisfish.script.export.tooltip=Exporter les scripts s\u00E9lectionn\u00E9s vers une archive zip isisfish.script.export.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 exporter isisfish.script.export.tooltip.chooseDir=Choisir le r\u00E9pertoire o\u00F9 exporter les scripts isisfish.script.import=Importer des scripts depuis une archive zip @@ -900,10 +892,12 @@ isisfish.script.menu.txtVCS=Serveur isisfish.script.menu.update=Synchronisation isisfish.script.new=Nouveau +isisfish.script.new.tooltip=Cr\u00E9e un nouveau script isisfish.script.paste=Coller +isisfish.script.paste.tooltip=Colle la s\u00E9lection courante (Ctrl-v) isisfish.script.save=Sauver +isisfish.script.save.tooltip=Sauve le script isisfish.script.title=Editeur de scripts -isisfish.script.txtExport=Exporter isisfish.season.toString=saison %1$s-%2$s isisfish.selectivity.equation=Equation isisfish.selectivity.selectPopulation=S\u00E9lectionnez une population

1 0

r2636 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 18 Sep '09

18 Sep '09

Author: chatellier Date: 2009-09-18 09:24:53 +0000 (Fri, 18 Sep 2009) New Revision: 2636 Removed: isis-fish/trunk/build-release.sh isis-fish/trunk/build.sh isis-fish/trunk/email-release.sh isis-fish/trunk/testNonRegression.sh Log: This files are not used anymore... Deleted: isis-fish/trunk/build-release.sh =================================================================== --- isis-fish/trunk/build-release.sh 2009-09-18 09:20:10 UTC (rev 2635) +++ isis-fish/trunk/build-release.sh 2009-09-18 09:24:53 UTC (rev 2636) @@ -1,124 +0,0 @@ -#!/bin/sh - -# script pour la creation d'un zip de release - -rep=$(dirname $0) -rep=$(cd $rep && pwd) -LOG="$rep/$(basename $0).log" -ISIS_FISH_DIR=$rep -ISIS_FISH_DATA_DIR=$ISIS_FISH_DIR/../isis-fish-data - - -EMAIL="isis-fish-user at lists.labs.libre-entreprise.org isis-fish-devel at lists.labs.libre-entreprise.org" -export CHANGELOG=$rep/changelog - -date=$(date) - -if [ "$USER" = "poussin" ]; then - LABS_LOGIN=bpoussin -else - LABS_LOGIN=$USER -fi - -dir=$(dirname $0) -cd $dir - -export VER=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml) -DATABASE_VER=${VER%%.*} -CVS_TAG=ver-${VER//./-} -RELEASE=isis-fish-$VER - -read -p "avez-vous bien commiter isis-fish et isis-fish-data, modifier la version dans pom.xml et IsisConfig.java et modifier le changelog (y/n) ?" -n 1 REPONSE -if [ "$REPONSE" != "y" ]; then - echo "Veuillez commiter isis-fish et isis-fish-data avant de faire la release" - exit 0 -fi -echo -e "\n" -echo "Log in file: $LOG" -echo "start $date" | tee -a $LOG - -#echo "tag des sources..." | tee -a $LOG -#(cd $ISIS_FISH_DIR && cvs tag $CVS_TAG) >> $LOG 2>&1 -#(cd $ISIS_FISH_DATA_DIR && cvs tag $CVS_TAG) >> $LOG 2>&1 - -#echo "build release $RELEASE" | tee -a $LOG - -#echo "prepare jar ..." | tee -a $LOG -#mvn -o clean compile package dependency:copy-dependencies >> $LOG 2>&1 - -# creation du repertoire cible -TARGET=/tmp/$RELEASE -mkdir -p $TARGET/lib - -echo "copy library ..." | tee -a $LOG -cp -v target/dependency/* $TARGET/lib >> $LOG 2>&1 -echo "copy isis-fish ..." | tee -a $LOG -cp -v target/$RELEASE.jar $TARGET >> $LOG 2>&1 - -# creation du Class Path -echo "create classpath ..." | tee -a $LOG -cd $TARGET -SEPW=";" -SEP=":" -CP=$RELEASE.jar -CPW=$RELEASE.jar -for f in lib/*; do - CP="$CP$SEP$f" - CPW="$CPW$SEPW$f" -done - -echo "create script ..." | tee -a $LOG -cat << EOF > $TARGET/go.bat -if not "%1" == "debug" goto start -Set DEBUG="-server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=38000,server=y,suspend=n" -shift - -:start -java -Xmx512m -Xms256m -cp $CPW %DEBUG% fr.ifremer.isisfish.IsisFish %1 %2 %3 %4 %5 %6 %7 %8 %9 > error.txt 2>&1 -EOF -unix2dos $TARGET/go.bat - -cat << EOF > $TARGET/go.sh -if [ "\$1" = "debug" ]; then - DEBUG="-server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=38000,server=y" - shift - if [ "\$1" != "suspend" ]; then - DEBUG="\$DEBUG,suspend=n" - else - shift - fi -fi - -java -Xmx512m -Xms256m -cp $CP \$DEBUG fr.ifremer.isisfish.IsisFish $* > error.txt 2>&1 -EOF - -chmod +x $TARGET/go.sh - -echo "create zip /tmp/$RELEASE.zip ..." | tee -a $LOG -(cd /tmp && zip -q -r $RELEASE.zip $RELEASE) >> $LOG 2>&1 - -echo "deplacement des anciennes versions dans old" | tee -a $LOG -ssh $LABS_LOGIN at labs.libre-entreprise.org "mkdir -p /home/groups/isis-fish/htdocs/download/version3/old && (mv -f /home/groups/isis-fish/htdocs/download/version3/isis-*.zip /home/groups/isis-fish/htdocs/download/version3/old 2>/dev/null || echo no old version)" - -echo "copy zip to labs ..." | tee -a $LOG -scp -l 600 /tmp/$RELEASE.zip $LABS_LOGIN at labs.libre-entreprise.org:/home/groups/isis-fish/htdocs/download/version3 >> $LOG 2>&1 - -echo "creation du zip des datas ..." | tee -a $LOG -(cd /tmp && rm -fr isis-database-$DATABASE_VER && cvs -d :pserver:anonymous at cvs.labs.libre-entreprise.org:/cvsroot/isis-fish export -r $CVS_TAG -d isis-database-$DATABASE_VER isis-fish-data && zip -r isis-database-$VER.zip isis-database-$DATABASE_VER) >> $LOG 2>&1 - -echo "copy du zip des datas sur labs ..." | tee -a $LOG -scp -l 600 /tmp/isis-database-$VER.zip $LABS_LOGIN at labs.libre-entreprise.org:/home/groups/isis-fish/htdocs/download/version3 >> $LOG 2>&1 - -echo "creation du site" | tee -a $LOG -(cd $ISIS_FISH_DIR/doc/manual && prepareManual.sh) >> $LOG 2>&1 -(cd $ISIS_FISH_DIR && mvn site) >> $LOG 2>&1 - -echo "deployement du site" | tee -a $LOG -(cd $ISIS_FISH_DIR && mvn site:deploy) >> $LOG 2>&1 - -echo "deployement du jar" | tee -a $LOG -(cd $ISIS_FISH_DIR && mvn deploy) >> $LOG 2>&1 - -echo "debut: $date fin:$(date)" | tee -a $LOG - -$rep/email-release.sh Deleted: isis-fish/trunk/build.sh =================================================================== --- isis-fish/trunk/build.sh 2009-09-18 09:20:10 UTC (rev 2635) +++ isis-fish/trunk/build.sh 2009-09-18 09:24:53 UTC (rev 2636) @@ -1,5 +0,0 @@ -#!/bin/bash - -rep=`dirname $0` - -(cd $rep && maven $* 2>&1 | sed "s/target\/src-build/src/g") Deleted: isis-fish/trunk/email-release.sh =================================================================== --- isis-fish/trunk/email-release.sh 2009-09-18 09:20:10 UTC (rev 2635) +++ isis-fish/trunk/email-release.sh 2009-09-18 09:24:53 UTC (rev 2636) @@ -1,68 +0,0 @@ -#!/bin/sh - -# script d'envoie de mail de release - -rep=$(dirname $0) -rep=$(cd $rep && pwd) -LOG="$rep/$(basename $0).log" -ISIS_FISH_DIR=$rep -ISIS_FISH_DATA_DIR=$ISIS_FISH_DIR/../isis-fish-data - - -EMAIL="isis-fish-user at lists.labs.libre-entreprise.org isis-fish-devel at lists.labs.libre-entreprise.org" -export CHANGELOG=$rep/changelog - -date=$(date) - -if [ "$USER" = "poussin" ]; then - LABS_LOGIN=bpoussin -else - LABS_LOGIN=$USER -fi - -dir=$(dirname $0) -cd $dir - -export VER=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml) -DATABASE_VER=${VER%.*} -CVS_TAG=ver-${VER//./-} -RELEASE=isis-fish-$VER - -read -p "Souhaitez-vous envoyer un mail sur les listes pour prévenir de cette nouvelle version (y/n) ?" -n 1 REPONSE -if [ "$REPONSE" = "y" ]; then - -echo "Le changelog attaché au mail sera" -cat << EOF -changelog $(cat $CHANGELOG | awk '{if ((match($0, "^isis-fish.*") && match($2, ENVRION["VER"])) || (state == 1 && !match($0, "^ --"))) { state=1;print $0; } else if (state == 1 && match($0, "^ --")) exit}') -EOF - -echo "Entrez le texte à ajouter en fin de mail terminez par ^D" -USER_TEXT=$(cat) - -(cat << EOF -Bonjour, - -Une nouvelle version d'isis-fish vient d'être mise en place : - -http://isis-fish.labs.libre-entreprise.org/download/version3/isis-fish-$VER.zip - -pour savoir comment installer et lancer isis-fish - -http://isis-fish.labs.libre-entreprise.org/v3/user/Installation.html - -changelog $(cat $CHANGELOG | awk '{if ((match($0, "^isis-fish.*") && match($2, ENVRION["VER"])) || (state == 1 && !match($0, "^ --"))) { state=1;print $0; } else if (state == 1 && match($0, "^ --")) exit}') - -$USER_TEXT - --- -Benjamin --------------------- -tél: +33 (0) 2 40 50 29 28 -email: poussin at codelutin.com () campagne du ruban ascii -http://www.codelutin.com /\ pour les mails en ascii - -EOF -) | mail -a "From: Benjamin POUSSIN <poussin at codelutin.com>" -s "[annonce] Nouvelle version d'isis-fish $VER" $EMAIL - -echo "mail envoye a $EMAIL" -fi Deleted: isis-fish/trunk/testNonRegression.sh =================================================================== --- isis-fish/trunk/testNonRegression.sh 2009-09-18 09:20:10 UTC (rev 2635) +++ isis-fish/trunk/testNonRegression.sh 2009-09-18 09:24:53 UTC (rev 2636) @@ -1,70 +0,0 @@ -#!/bin/sh - -#JAVA="/opt/repository/jdk1.6.0/bin/java -splash:src/resources/images/splash2.jpg" -JAVA=java - -TEMP=`getopt -o dnt:: --long debug,nosuspend,trace:: \ - -n 'go.sh' -- "$@"` - -if [ $? != 0 ] ; then - echo "bag argument" - exit 1 -fi - -eval set -- "$TEMP" - -while true ; do - case "$1" in - -d|--debug) - echo "Debug mode" - DEBUG="-server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=38000,server=y" - shift ;; - -n|--nosuspend) - echo "Debug no suspend mode" - DEBUG="$DEBUG,suspend=n" - shift ;; - -t|--trace) - echo "Trace mode" - case "$2" in - "") TRACE_FILE="-Daspectwerkz.definition.file=$rep/src/resources/trace-aop.xml" # -Daspectwerkz.transform.verbose=true" # -Daspectwerkz.transform.details=true" - ;; - *) TRACE_FILE="-Daspectwerkz.definition.file=$2" # -Daspectwerkz.transform.verbose=true" # -Daspectwerkz.transform.details=true" - esac - shift 2 ;; - --) shift ; break ;; - *) echo "Bad argument $1!" ; exit 1 ;; - esac -done - -dir=$(dirname $0) -cd $dir - -VER=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml) -RELEASE=isis-fish-$VER - -MX=256M - -rep=`dirname $0` -rep=`cd $rep && pwd` - -cd $rep - -if [ ! -f $rep/target/$RELEASE.jar ]; then - mvn -o compile jar:jar -fi - -if [ ! -d $rep/target/dependency ]; then - mvn -o dependency:copy-dependencies -fi - -aspectwerkz="" -CL=$rep/target/classes:$rep/target/test-classes #:$rep/target/isis-fish-3.0.0.jar -for f in $rep/target/dependency/*.jar; do - CL=$CL:$f - if [ -n "$(echo $f | grep aspectwerkz-jdk5)" ]; then - aspectwerkz="-javaagent:$f" - fi -done - -LOG="-Dlog4j.configuration=file:$rep/src/resources/log4j.properties" # -Dlog4j.debug" -$JAVA -Xmx$MX -Xms$MX -classpath $CL $NOaspectwerkz $TRACE_FILE $LOG $JVM_OPT $DEBUG fr.ifremer.isisfish.simulator.SimulationHelperTest "$@"

1 0

r2635 - isis-fish/trunk/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org 18 Sep '09

18 Sep '09

Author: chatellier Date: 2009-09-18 09:20:10 +0000 (Fri, 18 Sep 2009) New Revision: 2635 Modified: isis-fish/trunk/src/main/assembly/go.bat isis-fish/trunk/src/main/assembly/go.sh Log: Passage a 1G0 de ram par defaut Modified: isis-fish/trunk/src/main/assembly/go.bat =================================================================== --- isis-fish/trunk/src/main/assembly/go.bat 2009-09-18 09:10:41 UTC (rev 2634) +++ isis-fish/trunk/src/main/assembly/go.bat 2009-09-18 09:20:10 UTC (rev 2635) @@ -1 +1 @@ -java -Xmx512M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt \ No newline at end of file +java -Xmx1024M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt \ No newline at end of file Modified: isis-fish/trunk/src/main/assembly/go.sh =================================================================== --- isis-fish/trunk/src/main/assembly/go.sh 2009-09-18 09:10:41 UTC (rev 2634) +++ isis-fish/trunk/src/main/assembly/go.sh 2009-09-18 09:20:10 UTC (rev 2635) @@ -1,6 +1,6 @@ #!/bin/sh -MEMORY="-Xmx512M" +MEMORY="-Xmx1024M" JRIARGS="-Djava.library.path=jri -DR.type=jni" java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt \ No newline at end of file

1 0