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

r4348 - trunk
by echatellier＠users.forge.codelutin.com May 23, 2016

May 23, 2016

Author: echatellier Date: 2016-05-23 21:55:54 +0200 (Mon, 23 May 2016) New Revision: 4348 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4348 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-05-23 18:55:46 UTC (rev 4347) +++ trunk/pom.xml 2016-05-23 19:55:54 UTC (rev 4348) @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-3</version> + <version>3.0-rc-4</version> <scope>compile</scope> </dependency> @@ -210,13 +210,13 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.6</version> + <version>3.6.1</version> <scope>runtime</scope>  </dependency> @@ -229,7 +229,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.18</version> + <version>1.7.21</version> <scope>runtime</scope> </dependency> @@ -319,7 +319,7 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.8</version> + <version>1.8.9</version> </dependency> <dependency> @@ -355,7 +355,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.11</version> + <version>1.8.12</version> <scope>compile</scope> <exclusions> <exclusion> @@ -546,11 +546,11 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.28.2</jaxxVersion> + <jaxxVersion>2.29</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.12-SNAPSHOT</topiaVersion> <hibernateVersion>5.1.0.Final</hibernateVersion> - <nuitonI18nVersion>3.4.1</nuitonI18nVersion> + <nuitonI18nVersion>3.5</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles>

1 0

r4347 - in trunk/src/main/java/fr/ifremer/isisfish: simulator/launcher ui/config
by echatellier＠users.forge.codelutin.com May 23, 2016

May 23, 2016

Author: echatellier Date: 2016-05-23 20:55:46 +0200 (Mon, 23 May 2016) New Revision: 4347 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4347 Log: Merge branch into trunk Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2016-05-23 16:50:38 UTC (rev 4346) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2016-05-23 18:55:46 UTC (rev 4347) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2014 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2008 - 2016 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -570,8 +570,10 @@ if (sshKeyUsed) { try { char[] passChars = SSHAgent.getAgent().getPassphrase(sshKey); - String passphrase = String.valueOf(passChars); - ui.setPassphrase(passphrase); + if (passChars != null) { + String passphrase = String.valueOf(passChars); + ui.setPassphrase(passphrase); + } } catch (InvalidPassphraseException e) { if (log.isWarnEnabled()) { log.warn("Can't key passphrase for key", e); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2016-05-23 16:50:38 UTC (rev 4346) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2016-05-23 18:55:46 UTC (rev 4347) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2016 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -305,8 +305,10 @@ SSHUserInfo ui = new SSHUserInfo(); if (sshKeyUsed) { char[] passchars = SSHAgent.getAgent().getPassphrase(currentSSHKey); - String passphrase = String.valueOf(passchars); - ui.setPassphrase(passphrase); + if (passchars != null) { + String passphrase = String.valueOf(passchars); + ui.setPassphrase(passphrase); + } setTestMessage(t("isisfish.simulator.ssh.configuration.connectingpk"), false); } else { setTestMessage(t("isisfish.simulator.ssh.configuration.connecting"), false); @@ -466,8 +468,10 @@ SSHUserInfo ui = new SSHUserInfo(); if (sshKeyUsed) { char[] passchars = SSHAgent.getAgent().getPassphrase(currentSSHKey); - String passphrase = String.valueOf(passchars); - ui.setPassphrase(passphrase); + if (passchars != null) { + String passphrase = String.valueOf(passchars); + ui.setPassphrase(passphrase); + } } session.setUserInfo(ui); session.connect(10000); // timeout

1 0

r4346 - in branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish: simulator/launcher ui/config
by echatellier＠users.forge.codelutin.com May 23, 2016

May 23, 2016

Author: echatellier Date: 2016-05-23 18:50:38 +0200 (Mon, 23 May 2016) New Revision: 4346 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4346 Log: fixes #8319: Impossible d'utiliser une cl?\195?\169 SSH sans passphrase Modified: branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java Modified: branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2016-03-14 10:01:28 UTC (rev 4345) +++ branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2016-05-23 16:50:38 UTC (rev 4346) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2014 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2008 - 2016 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -570,8 +570,10 @@ if (sshKeyUsed) { try { char[] passChars = SSHAgent.getAgent().getPassphrase(sshKey); - String passphrase = String.valueOf(passChars); - ui.setPassphrase(passphrase); + if (passChars != null) { + String passphrase = String.valueOf(passChars); + ui.setPassphrase(passphrase); + } } catch (InvalidPassphraseException e) { if (log.isWarnEnabled()) { log.warn("Can't key passphrase for key", e); Modified: branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java =================================================================== --- branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2016-03-14 10:01:28 UTC (rev 4345) +++ branches/isis-fish-4.4.0.x/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2016-05-23 16:50:38 UTC (rev 4346) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2016 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -305,8 +305,10 @@ SSHUserInfo ui = new SSHUserInfo(); if (sshKeyUsed) { char[] passchars = SSHAgent.getAgent().getPassphrase(currentSSHKey); - String passphrase = String.valueOf(passchars); - ui.setPassphrase(passphrase); + if (passchars != null) { + String passphrase = String.valueOf(passchars); + ui.setPassphrase(passphrase); + } setTestMessage(t("isisfish.simulator.ssh.configuration.connectingpk"), false); } else { setTestMessage(t("isisfish.simulator.ssh.configuration.connecting"), false); @@ -466,8 +468,10 @@ SSHUserInfo ui = new SSHUserInfo(); if (sshKeyUsed) { char[] passchars = SSHAgent.getAgent().getPassphrase(currentSSHKey); - String passphrase = String.valueOf(passchars); - ui.setPassphrase(passphrase); + if (passchars != null) { + String passphrase = String.valueOf(passchars); + ui.setPassphrase(passphrase); + } } session.setUserInfo(ui); session.connect(10000); // timeout

1 0