r2277 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/simulator/launcher java/fr/ifremer/isisfish/ui/simulator/launcher resources/i18n - Isis-fish-commits

26 May 2009

Author: chatellier
Date: 2009-05-26 08:18:00 +0000 (Tue, 26 May 2009)
New Revision: 2277

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Le home distant de l'utilisateur est necessaire :(.
Le temp doit ?\195?\170tre absolu.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-05-26 08:16:31 UTC (rev 2276)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-05-26 08:18:00 UTC (rev 2277)
@@ -383,6 +383,25 @@
     }
 
     /**
+     * Get remote user home directory.
+     * 
+     * @return remote user home
+     */
+    public String getSimulatorSshUserHome() {
+        String result = getOption(Option.SIMULATOR_SSH_USER_HOME.key);
+        return result;
+    }
+
+    /**
+     * Change isis remote home directory.
+     * 
+     * @param userhome new remote home
+     */
+    public void setSimulatorSshUserHome(String userhome) {
+        setOption(Option.SIMULATOR_SSH_USER_HOME.key, userhome);
+    }
+
+    /**
      * Retourne le chemin distant ou est installé isis.
      * 
      * @return remote isis home
@@ -852,7 +871,7 @@
         /** Serveur accessible par ssh : login */
         SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""),
         /** Serveur accessible par ssh : user home directory */
-        //SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", _("isisfish.config.main.simulation.ssh.userhome.description"), ""),
+        SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", _("isisfish.config.main.simulation.ssh.userhome.description"), ""),
         /** Serveur accessible par ssh : remote data path */
         SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"),
         /** Serveur accessible par ssh : remote isis home install */

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-26 08:16:31 UTC (rev 2276)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java	2009-05-26 08:18:00 UTC (rev 2277)
@@ -1003,7 +1003,7 @@
                 + "/qdel `cat \"" + getRemoteTempDirectory() + "/" + simulationId + ".id\"`";
         
         // and delete simulation
-        command += " && rm -rf \"" + IsisFish.config.getSimulatorSshDataPath() + "/simulations/" + simulationId + "\"";
+        //command += " && rm -rf \"" + IsisFish.config.getSimulatorSshDataPath() + "/simulations/" + simulationId + "\"";
         
         if (log.isDebugEnabled()) {
             log.debug("Send stop request : " + command);
@@ -1025,9 +1025,9 @@
     protected String getRemoteTempDirectory() {
         String remotePath = IsisFish.config.getSimulatorSshTmpPath();
         
-        /*if (!remotePath.startsWith("/")) {
+        if (!remotePath.startsWith("/")) {
             remotePath = IsisFish.config.getSimulatorSshUserHome() + "/" + remotePath;
-        }*/
+        }
 
         // upload directory in that dir
         if (!remotePath.endsWith("/")) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx	2009-05-26 08:16:31 UTC (rev 2276)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx	2009-05-26 08:18:00 UTC (rev 2277)
@@ -54,7 +54,7 @@
         sshKeyField.setText(IsisFish.config.getSSHPrivateKeyFilePath().getAbsolutePath());
 
         // caparmor config
-        //sshUserhomeField.setText(IsisFish.config.getSimulatorSshUserHome());
+        sshUserhomeField.setText(IsisFish.config.getSimulatorSshUserHome());
         sshDatapathField.setText(IsisFish.config.getSimulatorSshDataPath());
         sshIsisHomeField.setText(IsisFish.config.getSimulatorSshIsisHome());
         sshTemppathField.setText(IsisFish.config.getSimulatorSshTmpPath());
@@ -155,7 +155,7 @@
         IsisFish.config.setSimulatorSshUsername(currentSSHUsername);
         IsisFish.config.setSSHPrivateKeyFilePath(currentSSHKey);
         
-        //IsisFish.config.setSimulatorSshUserHome(currentSSHUserhome);
+        IsisFish.config.setSimulatorSshUserHome(currentSSHUserhome);
         IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath);
         IsisFish.config.setSimulatorSshIsisHome(currentSSHIsisHome);
         IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath);
@@ -226,8 +226,8 @@
             setTestMessage(_("isisfish.simulator.ssh.configuration.connectionok"), false);
             
             // get user home
-            //currentSSHUserhome = getUserHomeDirectory(session);
-            //sshUserhomeField.setText(currentSSHUserhome);
+            currentSSHUserhome = getUserHomeDirectory(session);
+            sshUserhomeField.setText(currentSSHUserhome);
             session.disconnect();
             
             validButton.setEnabled(true);
@@ -241,6 +241,11 @@
                 log.error("Can't connect", e);
             }
             setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e.getMessage()), true);
+        } catch (SSHException e) {
+            if (log.isErrorEnabled()) {
+                log.error("Can't connect", e);
+            }
+            setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e.getMessage()), true);
         } catch (InvalidPassphraseException e) {
             if (log.isErrorEnabled()) {
                 log.error("Can't connect", e);
@@ -251,8 +256,6 @@
     
     /**
      * Get user home directory with an opened session.
-     *
-     * @deprecated not used anymore
      */
     protected String getUserHomeDirectory(Session session) throws SSHException {
     
@@ -352,7 +355,6 @@
     </row>
   </Table>
   <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.environment"))}'>
-    <!-- home is not necessary
     <row fill='horizontal'>
       <cell>
         <JLabel id='sshUserhomeLabel' text='isisfish.config.main.simulation.ssh.userhome'
@@ -362,7 +364,7 @@
         <JTextField id='sshUserhomeField' enabled='false' toolTipText='isisfish.config.main.simulation.ssh.userhome.description'
           onKeyReleased="doCheck()" />
       </cell>
-    </row> -->
+    </row>
     <row fill='horizontal'>
       <cell>
         <JLabel id='sshDatapathLabel' text='isisfish.config.main.simulation.ssh.datapath'

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-26 08:16:31 UTC (rev 2276)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-05-26 08:18:00 UTC (rev 2277)
@@ -185,6 +185,7 @@
 isisfish.config.main.simulation.ssh.server.description=Server adress
 isisfish.config.main.simulation.ssh.tmppath=Server temp directory
 isisfish.config.main.simulation.ssh.tmppath.description=Server temp directory
+isisfish.config.main.simulation.ssh.userhome=User home directory
 isisfish.config.main.simulation.ssh.userhome.description=User home directory
 isisfish.config.main.simulation.ssh.username=SSH identifier
 isisfish.config.main.simulation.ssh.username.description=SSH identifier

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-26 08:16:31 UTC (rev 2276)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-05-26 08:18:00 UTC (rev 2277)
@@ -185,7 +185,8 @@
 isisfish.config.main.simulation.ssh.server.description=Adresse du serveur
 isisfish.config.main.simulation.ssh.tmppath=Dossier temporaire
 isisfish.config.main.simulation.ssh.tmppath.description=Emplacement du dossier temporaire
-isisfish.config.main.simulation.ssh.userhome.description=R\u00E9pertoire d'accueil de l'utilsateur
+isisfish.config.main.simulation.ssh.userhome=R\u00E9pertoire d'accueil
+isisfish.config.main.simulation.ssh.userhome.description=R\u00E9pertoire d'accueil de l'utilisateur
 isisfish.config.main.simulation.ssh.username=Identifiant
 isisfish.config.main.simulation.ssh.username.description=Identifiant SSH pour se connecter au serveur
 isisfish.config.main.simulationServer.description=l'url du serveur de simulations distant

    

r2277 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/simulator/launcher java/fr/ifremer/isisfish/ui/simulator/launcher resources/i18n

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)