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

r4353 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com July 26, 2016

July 26, 2016

Author: echatellier Date: 2016-07-26 16:09:39 +0200 (Tue, 26 Jul 2016) New Revision: 4353 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4353 Log: Fix compilation Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2016-06-29 14:05:19 UTC (rev 4352) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2016-07-26 14:09:39 UTC (rev 4353) @@ -25,6 +25,8 @@ package fr.ifremer.isisfish.simulator; +import static org.nuiton.i18n.I18n.t; + import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.entities.Observation;

1 0

r4352 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by bpoussin＠users.forge.codelutin.com June 29, 2016

June 29, 2016

Author: bpoussin Date: 2016-06-29 16:05:19 +0200 (Wed, 29 Jun 2016) New Revision: 4352 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4352 Log: change log level from warn to debug Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2016-06-18 07:59:11 UTC (rev 4351) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2016-06-29 14:05:19 UTC (rev 4352) @@ -25,17 +25,6 @@ package fr.ifremer.isisfish.simulator; -import static org.nuiton.i18n.I18n.t; - -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; - import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.entities.Observation; @@ -45,6 +34,13 @@ import fr.ifremer.isisfish.result.ResultInfoHelper; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.types.TimeStep; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixND; /** * Used to store and retrieve result during simulation. This class manage @@ -199,7 +195,7 @@ } public void addActiveRule(TimeStep step, Rule rule) throws IsisFishException { - log.warn("addActiveRule not implemented"); + log.debug("addActiveRule not implemented"); // FIXME: addActiveRule not implemented }

1 0

r4351 - branches/isis-fish-4.4.0.x/src/main/resources
by echatellier＠users.forge.codelutin.com June 18, 2016

June 18, 2016

Author: echatellier Date: 2016-06-18 09:59:11 +0200 (Sat, 18 Jun 2016) New Revision: 4351 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4351 Log: Fix log level filtering Modified: branches/isis-fish-4.4.0.x/src/main/resources/log4j2.xml Modified: branches/isis-fish-4.4.0.x/src/main/resources/log4j2.xml =================================================================== (Binary files differ)

1 0

r4350 - in trunk: . src/main/java/fr/ifremer/isisfish/logging src/main/resources
by echatellier＠users.forge.codelutin.com June 18, 2016

June 18, 2016

Author: echatellier Date: 2016-06-18 09:52:08 +0200 (Sat, 18 Jun 2016) New Revision: 4350 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4350 Log: Fix log level filtering Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationThresholdFilter.java trunk/src/main/resources/log4j2.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-06-15 09:26:00 UTC (rev 4349) +++ trunk/pom.xml 2016-06-18 07:52:08 UTC (rev 4350) @@ -242,7 +242,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.5</version> + <version>2.6.1</version> <scope>compile</scope> </dependency> @@ -249,7 +249,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.5</version> + <version>2.6.1</version> <scope>compile</scope> </dependency> @@ -256,7 +256,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.5</version> + <version>2.6.1</version> <scope>runtime</scope> </dependency> @@ -263,7 +263,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.5</version> + <version>2.6.1</version> <scope>runtime</scope> </dependency> Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationThresholdFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationThresholdFilter.java 2016-06-15 09:26:00 UTC (rev 4349) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationThresholdFilter.java 2016-06-18 07:52:08 UTC (rev 4350) @@ -48,6 +48,8 @@ import fr.ifremer.isisfish.datastore.SimulationPlanStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; +import java.util.Map; + /** * Filter always available in log4j configuration that filter simulation log depending of simulation * log level configuration. @@ -56,15 +58,25 @@ public final class SimulationThresholdFilter extends AbstractFilter { private Level defaultThreshold = Level.ERROR; - /** Simulation id. Present in MDC context only if a simulation is running. */ + /** + * Simulation id. Present in MDC context only if a simulation is running. + */ public static final String SIMULATION_ID = "simulationId"; - /** Simulation log file for lof4j file appender (only if simulationId is defined) */ + /** + * Simulation log file for lof4j file appender (only if simulationId is defined) + */ public static final String SIMULATION_LOG_FILE = "simulationLogFile"; - /** {@code fr.ifremer.isisfish} package log level. */ + /** + * {@code fr.ifremer.isisfish} package log level. + */ public static final String SIMUALTION_APPLICATION_LEVEL = "simulationApplicationLevel"; - /** {@code org.nuiton} package log level. */ + /** + * {@code org.nuiton} package log level. + */ public static final String SIMULATION_LIB_LEVEL = "simulationLibLevel"; - /** Script log level. */ + /** + * Script log level. + */ public static final String SIMULATION_SCRIPT_LEVEL = "simulationScriptLevel"; private SimulationThresholdFilter(final Level defaultLevel, final Result onMatch, final Result onMismatch) { @@ -75,33 +87,33 @@ @Override public Result filter(final Logger logger, final Level level, final Marker marker, final String msg, final Object... params) { - return filter(logger.getName(), level); + return filter(logger.getName(), level, ThreadContext.getContext()); } @Override public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg, final Throwable t) { - return filter(logger.getName(), level); + return filter(logger.getName(), level, ThreadContext.getContext()); } @Override public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg, final Throwable t) { - return filter(logger.getName(), level); + return filter(logger.getName(), level, ThreadContext.getContext()); } @Override public Result filter(final LogEvent event) { - return filter(event.getLoggerFqcn(), event.getLevel()); + return filter(event.getLoggerFqcn(), event.getLevel(), event.getContextMap()); } - private Result filter(final String loggerFqcn, final Level level) { + private Result filter(final String loggerFqcn, final Level level, final Map<String, String> contextMap) { - String simulationId = ThreadContext.get("simulationId"); + String simulationId = contextMap.get("simulationId"); Result result; - // so simulation, no filtering + // so simulation, no specific filtering (neutral) if (simulationId == null) { result = Result.NEUTRAL; } else { @@ -108,9 +120,9 @@ Level ctxLevel = defaultThreshold; if (loggerFqcn.startsWith("fr.ifremer.isisfish")) { - ctxLevel = Level.getLevel(ThreadContext.get("simulationApplicationLevel")); + ctxLevel = Level.getLevel(contextMap.get("simulationApplicationLevel")); } else if (loggerFqcn.startsWith("org.nuiton")) { - ctxLevel = Level.getLevel(ThreadContext.get("simulationLibLevel")); + ctxLevel = Level.getLevel(contextMap.get("simulationLibLevel")); } else if (StringUtils.startsWithAny(loggerFqcn, ExportStorage.EXPORT_PATH, FormuleStorage.FORMULE_PATH, @@ -122,7 +134,7 @@ SensitivityExportStorage.SENSITIVITY_EXPORT_PATH, SimulationPlanStorage.SIMULATION_PLAN_PATH, SimulatorStorage.SIMULATOR_PATH)) { - ctxLevel = Level.getLevel(ThreadContext.get("simulationScriptLevel")); + ctxLevel = Level.getLevel(contextMap.get("simulationScriptLevel")); } result = level.isMoreSpecificThan(ctxLevel) ? onMatch : onMismatch; @@ -133,9 +145,10 @@ /** * Create the DynamicThresholdFilter. + * * @param defaultThreshold The default Level. - * @param onMatch The action to perform if a match occurs. - * @param onMismatch The action to perform if no match occurs. + * @param onMatch The action to perform if a match occurs. + * @param onMismatch The action to perform if no match occurs. * @return The DynamicThresholdFilter. */ @PluginFactory Modified: trunk/src/main/resources/log4j2.xml =================================================================== (Binary files differ)

1 0

r4349 - trunk
by echatellier＠users.forge.codelutin.com June 15, 2016

June 15, 2016

Author: echatellier Date: 2016-06-15 11:26:00 +0200 (Wed, 15 Jun 2016) New Revision: 4349 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4349 Log: Revert topia snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-05-23 19:55:54 UTC (rev 4348) +++ trunk/pom.xml 2016-06-15 09:26:00 UTC (rev 4349) @@ -548,8 +548,8 @@  <jaxxVersion>2.29</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> - <topiaVersion>2.12-SNAPSHOT</topiaVersion> - <hibernateVersion>5.1.0.Final</hibernateVersion> + <topiaVersion>2.11</topiaVersion> + <hibernateVersion>4.3.11.Final</hibernateVersion> <nuitonI18nVersion>3.5</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

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

r4345 - branches/isis-fish-4.4.0.x
by echatellier＠users.forge.codelutin.com March 14, 2016

March 14, 2016

Author: echatellier Date: 2016-03-14 11:01:28 +0100 (Mon, 14 Mar 2016) New Revision: 4345 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4345 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/isis-fish-4.4.0.x/pom.xml Modified: branches/isis-fish-4.4.0.x/pom.xml =================================================================== --- branches/isis-fish-4.4.0.x/pom.xml 2016-03-14 10:01:25 UTC (rev 4344) +++ branches/isis-fish-4.4.0.x/pom.xml 2016-03-14 10:01:28 UTC (rev 4345) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.0.1</version> + <version>4.4.0.2-SNAPSHOT</version>  <dependencies> @@ -799,9 +799,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.1</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.1</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.0.1</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.4.0.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/branches/isis-fish-4.4.0.x</developerConnection> + <url>https://svn.codelutin.com/isis-fish/branches/isis-fish-4.4.0.x</url> </scm> <repositories>

1 0

r4344 - tags
by echatellier＠users.forge.codelutin.com March 14, 2016

March 14, 2016

Author: echatellier Date: 2016-03-14 11:01:25 +0100 (Mon, 14 Mar 2016) New Revision: 4344 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4344 Log: [maven-release-plugin] copy for tag isis-fish-4.4.0.1 Added: tags/isis-fish-4.4.0.1/

1 0