From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:08 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2236 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui
	java/fr/ifremer/isisfish/ui/simulator
	java/fr/ifremer/isisfish/ui/simulator/launcher resources/i18n
Date: Mon, 18 May 2009 17:23:12 +0200
Message-ID: <20090518152313.012D9461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7064513706499608578=="

--===============7064513706499608578==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2009-05-18 15:23:12 +0000 (Mon, 18 May 2009)
New Revision: 2236

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SS=
HLauncherConfigUI.jaxx
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 caparmor configuration frame

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-05=
-18 14:37:36 UTC (rev 2235)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-05=
-18 15:23:12 UTC (rev 2236)
@@ -191,13 +191,13 @@
         File result =3D getOptionAsFile(Option.DATABASE_DIRECTORY.key);
         return result;
     }
-   =20
+
     /**
      * Retourne le lock a utiliser pour la base h2.
      *=20
      * Par defaut la base utilise 'file'.
      *=20
-     * Les valeur accept=C3=A9es sont :
+     * Les valeurs accept=C3=A9es sont :
      *  - file
      *  - socket
      *  - no

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2009-=
05-18 14:37:36 UTC (rev 2235)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2009-=
05-18 15:23:12 UTC (rev 2236)
@@ -17,38 +17,28 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
-
-/**
- * WelcomeUI.
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
- * by : $Author: sletellier $
- */
  -->
 <JFrame id=3D'isisfishFrame' title=3D"isisfish.welcome.title" width=3D'874' =
height=3D'736' resizable=3D"true" location=3D'{new Point(0,23)}' layout=3D'{n=
ew BorderLayout()}'>
     <script><![CDATA[
     import static org.codelutin.i18n.I18n._;
+    import javax.swing.JFrame;
+
+    import fr.ifremer.isisfish.IsisFish;
+    import fr.ifremer.isisfish.IsisConfig;
     import fr.ifremer.isisfish.ui.simulator.SimulAction;
     import fr.ifremer.isisfish.ui.input.InputUI;
     import fr.ifremer.isisfish.ui.input.InputAction;
+    import fr.ifremer.isisfish.ui.input.InputSaveVerifier;
     import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
     import fr.ifremer.isisfish.ui.result.ResultAction;
     import fr.ifremer.isisfish.ui.result.ResultView;
     import fr.ifremer.isisfish.ui.script.ScriptUI;
     import fr.ifremer.isisfish.ui.simulator.SimulUI;
     import fr.ifremer.isisfish.ui.simulator.QueueUI;
-    import jaxx.runtime.DefaultJAXXContext;
-    import fr.ifremer.isisfish.IsisFish;
-    import fr.ifremer.isisfish.IsisConfig;
-    import javax.swing.JFrame;
+    import fr.ifremer.isisfish.ui.simulator.launcher.SSHLauncherConfigUI;
     import org.codelutin.widget.AboutFrame;
     import jaxx.runtime.JAXXInitialContext;
-    import fr.ifremer.isisfish.ui.input.InputSaveVerifier;
+    import jaxx.runtime.DefaultJAXXContext;
=20
     Map<JFrame, WelcomePanelUI> allFrameOpened;
     WelcomeSaveVerifier verifier =3D new WelcomeSaveVerifier();
@@ -127,6 +117,15 @@
 // FIXME a reimplanter
 // fr.ifremer.isisfish.versionning.ui.VCSConfigUI.doLaunch()
     }
+   =20
+    protected void configurationSSHLauncher() {
+        SSHLauncherConfigUI configUI =3D new SSHLauncherConfigUI();
+        configUI.pack();
+        configUI.setSize(600, configUI.getHeight());
+        org.codelutin.widget.SwingUtil.center(configUI);
+        configUI.setVisible(true);
+    }
+   =20
     protected void help(String urlAlias) {
         Help.showURL(urlAlias);
     }
@@ -143,8 +142,7 @@
 	   // center frame
 	   Dimension dim =3D getToolkit().getScreenSize();
 	   about.setSize(640, 520);
-	   about.setLocation((dim.width - about.getSize().width) / 2,
-	     (dim.height - about.getSize().height) / 2);
+	   org.codelutin.widget.SwingUtil.center(about);
 	   about.setVisible(true);
     }
     ]]>
@@ -166,7 +164,8 @@
             <JSeparator/>
             <JMenu text=3D"isisfish.welcome.menu.configuration">
                 <JMenuItem text=3D"isisfish.welcome.menu.configuration" enab=
led=3D'false' onActionPerformed=3D'config()'/>
-                <JMenuItem text=3D"isisfish.welcome.menu.vcs.configuration" =
enabled=3D'false' onActionPerformed=3D'configVCS()'/>
+                <JMenuItem text=3D"isisfish.welcome.menu.configuration.vcs" =
enabled=3D'false' onActionPerformed=3D'configVCS()'/>
+                <JMenuItem text=3D"isisfish.welcome.menu.configuration.sshla=
uncher" onActionPerformed=3D'configurationSSHLauncher()'/>
             </JMenu>
         </JMenu>
         <JMenu text=3D"isisfish.welcome.menu.help">

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launche=
r/SSHLauncherConfigUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/S=
SHLauncherConfigUI.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/S=
SHLauncherConfigUI.jaxx	2009-05-18 15:23:12 UTC (rev 2236)
@@ -0,0 +1,278 @@
+<!-- ##%
+Copyright (C) 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
+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.
+##% -->
+<JDialog resizable=3D"false" title=3D"isisfish.simulator.ssh.configuration.t=
itle" layout=3D"{new BoxLayout(this.getContentPane(), BoxLayout.PAGE_AXIS)}">
+  <script><![CDATA[
+
+    import fr.ifremer.isisfish.IsisFish;
+
+    protected String currentSSHserver;
+    protected String currentSSHUsername;
+    protected String currentSSHKey;
+    protected String currentSSHDatapath;
+    protected String currentSSHIsisHome;
+    protected String currentSSHTempPath;
+    protected String currentSSHScriptCommand;
+    protected String currentSSHControlInterval;
+    protected String currentSSHSimultaneousSimulation;
+
+    // fill default values
+    resetSSHConfiguration();
+
+    /**
+     * Reset values with default configuration values.
+     */
+    protected void resetSSHConfiguration() {
+        // server config
+        sshServerField.setText(IsisFish.config.getSimulatorSshServer());
+        usernameField.setText(IsisFish.config.getSimulatorSshUsername());
+        sshKeyField.setText(IsisFish.config.getSSHPrivateKeyFilePath().getAb=
solutePath());
+
+        // caparmor config
+        sshDatapathField.setText(IsisFish.config.getSimulatorSshDataPath());
+        sshIsisHomeField.setText(IsisFish.config.getSimulatorSshIsisHome());
+        sshTemppathField.setText(IsisFish.config.getSimulatorSshTmpPath());
+        sshScriptQueueCommandField.setText(IsisFish.config.getSimulatorSshAd=
dToQueueCommand());
+        sshControlIntervalField.setText(String.valueOf(IsisFish.config.getSi=
mulatorSshControlCheckInterval()));
+        sshSimultaneousSimulationField.setText(String.valueOf(IsisFish.confi=
g.getSimulatorSshMaxSimultaneousSimulation()));
+
+        doCheck();
+    }
+
+    protected void doCheck() {
+   =20
+        boolean configurationValid =3D true;
+       =20
+        // copy values
+        currentSSHserver =3D sshServerField.getText().trim();
+        if (currentSSHserver.isEmpty()) {
+            configurationValid =3D false;
+            setColor(true, sshServerField);
+        }
+        else {
+            setColor(false, sshServerField);
+        }
+       =20
+        currentSSHUsername =3D usernameField.getText().trim();
+        if (!currentSSHUsername.matches("\\w+")) {
+            configurationValid =3D false;
+            setColor(true, usernameField);
+        }
+        else {
+            setColor(false, usernameField);
+        }
+       =20
+        //currentSSHKey
+       =20
+        currentSSHDatapath =3D sshDatapathField.getText().trim();
+        if (currentSSHDatapath.isEmpty()) {
+            configurationValid =3D false;
+            setColor(true, sshDatapathField);
+        }
+        else {
+            setColor(false, sshDatapathField);
+        }
+       =20
+        currentSSHIsisHome =3D sshIsisHomeField.getText().trim();
+        if (currentSSHIsisHome.isEmpty()) {
+            configurationValid =3D false;
+            setColor(true, sshIsisHomeField);
+        }
+        else {
+            setColor(false, sshIsisHomeField);
+        }
+       =20
+        currentSSHTempPath =3D sshTemppathField.getText().trim();
+        if (!currentSSHTempPath.startsWith("/")) {
+            configurationValid =3D false;
+            setColor(true, sshTemppathField);
+        }
+        else {
+            setColor(false, sshTemppathField);
+        }
+       =20
+        currentSSHScriptCommand =3D sshScriptQueueCommandField.getText().tri=
m();
+        if (currentSSHScriptCommand.isEmpty()) {
+            configurationValid =3D false;
+            setColor(true, sshScriptQueueCommandField);
+        }
+        else {
+            setColor(false, sshScriptQueueCommandField);
+        }
+       =20
+        currentSSHControlInterval =3D sshControlIntervalField.getText().trim=
();
+        if (!currentSSHControlInterval.matches("\\d+")) {
+            configurationValid =3D false;
+            setColor(true, sshControlIntervalField);
+        }
+        else {
+            setColor(false, sshControlIntervalField);
+        }
+       =20
+        currentSSHSimultaneousSimulation =3D sshSimultaneousSimulationField.=
getText().trim();
+        if (!currentSSHSimultaneousSimulation.matches("\\d+")) {
+            configurationValid =3D false;
+            setColor(true, sshSimultaneousSimulationField);
+        }
+        else {
+            setColor(false, sshSimultaneousSimulationField);
+        }
+       =20
+        okButton.setEnabled(configurationValid);
+    }
+   =20
+    /**
+     * Set values in config and force configuration save.
+     */
+    protected void saveSSHConfiguration() {
+        IsisFish.config.setSimulatorSshServer(currentSSHserver);
+        IsisFish.config.setSimulatorSshUsername(currentSSHUsername);
+       =20
+        IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath);
+        IsisFish.config.setSimuatorShhIsisHome(currentSSHIsisHome);
+        IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath);
+        IsisFish.config.setSimulatorSshAddToQueueCommand(currentSSHScriptCom=
mand);
+        IsisFish.config.setSimulatorSshControlCheckInterval(Long.parseLong(c=
urrentSSHControlInterval));
+        IsisFish.config.setSimulatorSshMaxSimultaneousSimulation(Integer.par=
seInt(currentSSHSimultaneousSimulation));
+       =20
+        IsisFish.config.saveForUser();
+        dispose();
+    }
+   =20
+    /**
+     * Close frame.
+     */
+    protected void cancelSSHConfiguration() {
+        dispose();
+    }
+
+    protected void setColor(boolean invalid, JComponent component) {
+        component.setForeground(invalid ? Color.RED: Color.BLACK);
+    }
+	]]></script>
+
+  <Table border=3D'{BorderFactory.createTitledBorder(_("isisfish.simulator.s=
sh.configuration.connection"))}'
+    fill=3D'horizontal'>
+    <row>
+      <cell>
+        <JLabel id=3D'sshServerLabel' text=3D'isisfish.config.main.simulatio=
n.ssh.server'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.login.descripti=
on' />
+      </cell>
+      <cell fill=3D'horizontal' weightx=3D"2.0">
+        <JTextField id=3D'sshServerField' toolTipText=3D'isisfish.config.mai=
n.simulation.ssh.login.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'usernameLabel' text=3D'isisfish.config.main.simulation=
.ssh.login'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.login.descripti=
on' />
+      </cell>
+      <cell>
+        <JTextField id=3D'usernameField' toolTipText=3D'isisfish.config.main=
.simulation.ssh.login.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'sshKeyLabel' text=3D'isisfish.config.ssh.key.file' too=
lTipText=3D'isisfish.config.ssh.key.file.description' />
+      </cell>
+      <cell>
+        <JTextField id=3D'sshKeyField' enabled=3D'false' toolTipText=3D'isis=
fish.config.ssh.key.file.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+  </Table>
+  <Table border=3D'{BorderFactory.createTitledBorder(_("isisfish.simulator.s=
sh.configuration.environment"))}'>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'sshDatapathLabel' text=3D'isisfish.config.main.simulat=
ion.ssh.datapath'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.datapath.descri=
ption' />
+      </cell>
+      <cell weightx=3D"1.0">
+        <JTextField id=3D'sshDatapathField' toolTipText=3D'isisfish.config.m=
ain.simulation.ssh.datapath.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'sshIsisHomeLabel' text=3D'isisfish.config.main.simulat=
ion.ssh.isis.home'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.isis.home.descr=
iption' />
+      </cell>
+      <cell>
+        <JTextField id=3D'sshIsisHomeField' toolTipText=3D'isisfish.config.m=
ain.simulation.ssh.isis.home.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'sshTemppathLabel' text=3D'isisfish.config.main.simulat=
ion.ssh.tmppath'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.tmppath.descrip=
tion' />
+      </cell>
+      <cell>
+        <JTextField id=3D'sshTemppathField' toolTipText=3D'isisfish.config.m=
ain.simulation.ssh.tmppath.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'sshScriptQueueCommandLabel' text=3D'isisfish.config.ma=
in.simulation.ssh.addscripttoqueuecommand'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.addscripttoqueu=
ecommand.description' />
+      </cell>
+      <cell>
+        <JTextField id=3D'sshScriptQueueCommandField'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.addscripttoqueu=
ecommand.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'sshControlIntervalLabel' text=3D'isisfish.config.main.=
simulation.ssh.control.check.interval'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.control.check.i=
nterval.description' />
+      </cell>
+      <cell>
+        <JTextField id=3D'sshControlIntervalField'
+          toolTipText=3D'isisfish.config.main.simulation.ssh.control.check.i=
nterval.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+    <row fill=3D'horizontal'>
+      <cell>
+        <JLabel id=3D'sshSimultaneousSimulationLabel' text=3D'isisfish.confi=
g.main.simulation.max.simultaneous.simulation'
+          toolTipText=3D'isisfish.config.main.simulation.max.simultaneous.si=
mulation.description' />
+      </cell>
+      <cell>
+        <JTextField id=3D'sshSimultaneousSimulationField'
+          toolTipText=3D'isisfish.config.main.simulation.max.simultaneous.si=
mulation.description'
+          onKeyReleased=3D"doCheck()" />
+      </cell>
+    </row>
+  </Table>
+  <Table>
+    <row fill=3D'horizontal'>
+      <cell fill=3D'horizontal'>
+        <JButton id=3D'okButton' text=3D'isisfish.common.ok' onActionPerform=
ed=3D"saveSSHConfiguration()" />
+      </cell>
+      <cell fill=3D'horizontal'>
+        <JButton id=3D'resetButton' text=3D'isisfish.common.reset' onActionP=
erformed=3D"resetSSHConfiguration()" />
+      </cell>
+      <cell fill=3D'horizontal'>
+        <JButton id=3D'cancelButton' text=3D'isisfish.common.cancel' onActio=
nPerformed=3D"cancelSSHConfiguration()" />
+      </cell>
+    </row>
+  </Table>
+</JDialog>

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
5-18 14:37:36 UTC (rev 2235)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
5-18 15:23:12 UTC (rev 2236)
@@ -29,7 +29,6 @@
 Create\ a\ new\ script=3D
 Cut\ current\ selection\ (Ctrl-x)=3D
 Error\ during\ vcs\ initialisation=3D
-Error\ while\ downloading\ file\ \:\ %s=3D
 Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys=3D
 Export\ selected\ script(s)\ to\ zip\ archive=3D
 Generate\ next\ simulation=3D
@@ -170,14 +169,22 @@
 isisfish.config.main.regionMap.description=3D
 isisfish.config.main.remoteCaparmor.description=3D
 isisfish.config.main.resultExport.description=3D
-isisfish.config.main.simulation.max.simultaneous.simulation.description=3D
-isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=3D
-isisfish.config.main.simulation.ssh.control.check.interval.description=3D
-isisfish.config.main.simulation.ssh.datapath.description=3D
-isisfish.config.main.simulation.ssh.isis.home.description=3D
-isisfish.config.main.simulation.ssh.login.description=3D
-isisfish.config.main.simulation.ssh.server.description=3D
-isisfish.config.main.simulation.ssh.tmppath.description=3D
+isisfish.config.main.simulation.max.simultaneous.simulation=3DSimultaneous s=
imulation
+isisfish.config.main.simulation.max.simultaneous.simulation.description=3DSi=
multaneous simulation to do on Caparmor
+isisfish.config.main.simulation.ssh.addscripttoqueuecommand=3DQsub command
+isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=3DQs=
ub command path
+isisfish.config.main.simulation.ssh.control.check.interval=3DControl check i=
nterval (seconds)
+isisfish.config.main.simulation.ssh.control.check.interval.description=3DCon=
trol check interval (seconds)
+isisfish.config.main.simulation.ssh.datapath=3DIsis-Fish database
+isisfish.config.main.simulation.ssh.datapath.description=3DIsis-Fish databas=
e path
+isisfish.config.main.simulation.ssh.isis.home=3DIsis-Fish home
+isisfish.config.main.simulation.ssh.isis.home.description=3DIsis-Fish instal=
lation directory
+isisfish.config.main.simulation.ssh.login=3DSSH identifier
+isisfish.config.main.simulation.ssh.login.description=3DSSH identifier
+isisfish.config.main.simulation.ssh.server=3DServer address
+isisfish.config.main.simulation.ssh.server.description=3DServer adress
+isisfish.config.main.simulation.ssh.tmppath=3DServer temp directory
+isisfish.config.main.simulation.ssh.tmppath.description=3DServer temp direct=
ory (must start with /)
 isisfish.config.main.simulationServer.description=3D
 isisfish.config.main.simulationShowOnlyError.description=3D
 isisfish.config.main.simulationShowOnlyQueue.description=3D
@@ -185,6 +192,8 @@
 isisfish.config.main.subSimulator.description=3D
 isisfish.config.main.userMail.description=3D
 isisfish.config.main.userName.description=3D
+isisfish.config.ssh.key.file=3DSSH key
+isisfish.config.ssh.key.file.description=3DPrivate SSH key path
 isisfish.config.vcs.hostName.description=3D
 isisfish.config.vcs.keyFile.description=3D
 isisfish.config.vcs.localDatabasePath.description=3D
@@ -235,8 +244,6 @@
 isisfish.error.delete.database=3DCan't delete database
 isisfish.error.delete.file=3Dcould not delete file %1$s
 isisfish.error.delete.vcs.files=3DCan't delete vcs files
-isisfish.error.dialog.message=3DSome errors have been detected
-isisfish.error.dialog.title=3DError
 isisfish.error.during.simulation=3DError during simulation
 isisfish.error.emigration.negative=3Demigration negative
 isisfish.error.empty.code.rubbin=3Drubbin's code is empty
@@ -911,6 +918,9 @@
 isisfish.simulator.launcher.remote=3Don Caparmor server=20
 isisfish.simulator.launcher.subprocess=3Din subprocess
 isisfish.simulator.simulaction.badid=3DCan't start simulation, bad id\: %s
+isisfish.simulator.ssh.configuration.connection=3DConnection information
+isisfish.simulator.ssh.configuration.environment=3DCaparmor configuration
+isisfish.simulator.ssh.configuration.title=3DCaparmor launcher configuration
 isisfish.simulator.subprocess.readoutput.error=3D
 isisfish.species.age=3DAge
 isisfish.species.cee=3DCEE
@@ -1022,6 +1032,8 @@
 isisfish.welcome.menu.about=3DAbout
 isisfish.welcome.menu.close=3DClose
 isisfish.welcome.menu.configuration=3DConfiguration
+isisfish.welcome.menu.configuration.sshlauncher=3D
+isisfish.welcome.menu.configuration.vcs=3D
 isisfish.welcome.menu.file=3DFile
 isisfish.welcome.menu.frame=3DFrame
 isisfish.welcome.menu.help=3DHelp
@@ -1037,7 +1049,6 @@
 isisfish.welcome.menu.script=3DScript
 isisfish.welcome.menu.simulation=3DSimulation Launcher
 isisfish.welcome.menu.synchro=3DServer Synchronisation
-isisfish.welcome.menu.vcs.configuration=3DConfiguration vcs
 isisfish.welcome.title=3DIfremer Simulation
 isisfish.wizardGroupCreation.allGroupsSameSize=3DAll groups have the same si=
ze
 isisfish.wizardGroupCreation.allValues=3DInput all the values

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
5-18 14:37:36 UTC (rev 2235)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
5-18 15:23:12 UTC (rev 2236)
@@ -29,7 +29,6 @@
 Create\ a\ new\ script=3D
 Cut\ current\ selection\ (Ctrl-x)=3D
 Error\ during\ vcs\ initialisation=3D
-Error\ while\ downloading\ file\ \:\ %s=3D
 Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys=3D
 Export\ selected\ script(s)\ to\ zip\ archive=3D
 Generate\ next\ simulation=3D
@@ -131,7 +130,7 @@
 isisfish.common.prev=3DPr\u00E9c\u00E9dent
 isisfish.common.region=3DR\u00E9gion
 isisfish.common.remove=3DSupprimer
-isisfish.common.reset=3Dreset
+isisfish.common.reset=3DR\u00E9initialiser
 isisfish.common.rules=3DR\u00E8gles
 isisfish.common.save=3DSauver
 isisfish.common.saveModel=3DSauver comme mod\u00E8le
@@ -170,14 +169,22 @@
 isisfish.config.main.regionMap.description=3Dle nom du r\u00E9pertoire conte=
nant les maps d'une r\u00E9gion
 isisfish.config.main.remoteCaparmor.description=3Dlance les simulations sur =
un serveur distant
 isisfish.config.main.resultExport.description=3DTODO
-isisfish.config.main.simulation.max.simultaneous.simulation.description=3D
-isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=3D
-isisfish.config.main.simulation.ssh.control.check.interval.description=3D
-isisfish.config.main.simulation.ssh.datapath.description=3D
-isisfish.config.main.simulation.ssh.isis.home.description=3D
-isisfish.config.main.simulation.ssh.login.description=3D
-isisfish.config.main.simulation.ssh.server.description=3D
-isisfish.config.main.simulation.ssh.tmppath.description=3D
+isisfish.config.main.simulation.max.simultaneous.simulation=3DNombre de simu=
lations simultan\u00E9es
+isisfish.config.main.simulation.max.simultaneous.simulation.description=3DNo=
mbre maximum de simulations pouvant \u00EAtre envoy\u00E9es au serveur
+isisfish.config.main.simulation.ssh.addscripttoqueuecommand=3DCommande 'qsub'
+isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=3DEm=
placemement de la commande 'qsub'
+isisfish.config.main.simulation.ssh.control.check.interval=3DV\u00E9rificati=
on de la progression (secondes)
+isisfish.config.main.simulation.ssh.control.check.interval.description=3DTem=
ps d'attente en secondes entre deux v\u00E9rifications de progression
+isisfish.config.main.simulation.ssh.datapath=3DBase de donn\u00E9es
+isisfish.config.main.simulation.ssh.datapath.description=3DEmplacement de la=
 base de donn\u00E9es (isis-database)
+isisfish.config.main.simulation.ssh.isis.home=3DInstallation d'Isis-Fish
+isisfish.config.main.simulation.ssh.isis.home.description=3DEmplacement d'in=
stallation d'Isis-Fish sur le serveur
+isisfish.config.main.simulation.ssh.login=3DIdentifiant
+isisfish.config.main.simulation.ssh.login.description=3DIdentifiant SSH pour=
 se connecter au serveur
+isisfish.config.main.simulation.ssh.server=3DAdresse du serveur
+isisfish.config.main.simulation.ssh.server.description=3DAdresse du serveur
+isisfish.config.main.simulation.ssh.tmppath=3DDossier temporaire
+isisfish.config.main.simulation.ssh.tmppath.description=3DEmplacement du dos=
sier temporaire (le chemin doit commencer par /)
 isisfish.config.main.simulationServer.description=3Dl'url du serveur de simu=
lations distant
 isisfish.config.main.simulationShowOnlyError.description=3Dpour indiquer si =
l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celle=
s avec erreur
 isisfish.config.main.simulationShowOnlyQueue.description=3Dpour indiquer si =
l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celle=
s effectu\u00E9es localement
@@ -185,6 +192,8 @@
 isisfish.config.main.subSimulator.description=3Dpour indiquer si les simulat=
ions sont \u00E0 effectuer localement dans un sous process
 isisfish.config.main.userMail.description=3Dle courriel de l'utilisateur
 isisfish.config.main.userName.description=3Dle nom - pr\u00E9nom de l'utilis=
ateur
+isisfish.config.ssh.key.file=3DCl\u00E9 SSH
+isisfish.config.ssh.key.file.description=3DEmplacement de la cl\u00E9 priv\u=
00E9e SSH
 isisfish.config.vcs.hostName.description=3Dle nom du serveur vcs \u00E0 util=
iser
 isisfish.config.vcs.keyFile.description=3Dle chemin complet du fichier de cl=
ef priv\u00E9e ssh2 \u00E0 utiliser lors d'une connexion s\u00E9curis\u00E9e
 isisfish.config.vcs.localDatabasePath.description=3D
@@ -235,8 +244,6 @@
 isisfish.error.delete.database=3DCan't delete database
 isisfish.error.delete.file=3Dcould not delete file %1$s
 isisfish.error.delete.vcs.files=3DCan't delete vcs files
-isisfish.error.dialog.message=3DUne erreur a \u00E9t\u00E9 d\u00E9tect\u00E9e
-isisfish.error.dialog.title=3DErreur
 isisfish.error.during.simulation=3DError during simulation
 isisfish.error.emigration.negative=3Demigration negative
 isisfish.error.empty.code.rubbin=3Dle code rubbin est vide
@@ -911,6 +918,9 @@
 isisfish.simulator.launcher.remote=3Dsur le serveur Caparmor
 isisfish.simulator.launcher.subprocess=3Ddans un sous processus
 isisfish.simulator.simulaction.badid=3DImpossible de lancer la simulation '%=
s' \: l'identifiant existe d\u00E9j\u00E0 \!
+isisfish.simulator.ssh.configuration.connection=3DInformation de connexion
+isisfish.simulator.ssh.configuration.environment=3DConfiguration sur Caparmor
+isisfish.simulator.ssh.configuration.title=3DConfiguration du lanceur Caparm=
or
 isisfish.simulator.subprocess.readoutput.error=3D
 isisfish.species.age=3DAge
 isisfish.species.cee=3DCEE
@@ -1022,6 +1032,8 @@
 isisfish.welcome.menu.about=3D\u00C0 propos
 isisfish.welcome.menu.close=3DFermer
 isisfish.welcome.menu.configuration=3DConfiguration
+isisfish.welcome.menu.configuration.sshlauncher=3DConfiguration Caparmor
+isisfish.welcome.menu.configuration.vcs=3DConfiguration vcs
 isisfish.welcome.menu.file=3DFichier
 isisfish.welcome.menu.frame=3DFen\u00EAtre
 isisfish.welcome.menu.help=3DAide
@@ -1037,7 +1049,6 @@
 isisfish.welcome.menu.script=3DScript
 isisfish.welcome.menu.simulation=3DLanceur de simulations
 isisfish.welcome.menu.synchro=3DSynchronisation Serveur
-isisfish.welcome.menu.vcs.configuration=3DConfiguration vcs
 isisfish.welcome.title=3DSimulation Ifremer
 isisfish.wizardGroupCreation.allGroupsSameSize=3DTous les groupes ont la m\u=
00EAme taille
 isisfish.wizardGroupCreation.allValues=3DInput all the values


--===============7064513706499608578==--