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

r4054 - in trunk/src/main: java/fr/ifremer/isisfish/datastore java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/ui/result java/fr/ifremer/isisfish/util resources/i18n
by bpoussin＠users.forge.codelutin.com 22 Jul '14

22 Jul '14

Author: bpoussin Date: 2014-07-22 21:54:22 +0200 (Tue, 22 Jul 2014) New Revision: 4054 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4054 Log: rewrite resume to use only String representation (no object instanciation) this prevent error when plan, export, rule or other doesn't exist localy Added: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-07-22 09:01:49 UTC (rev 4053) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-07-22 19:54:22 UTC (rev 4054) @@ -43,6 +43,7 @@ import java.util.Set; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -175,14 +176,14 @@ // general information String info = getInformation(); - if (info != null && !"".equals(info)) { - result += "Information:\n" + info + "\n"; + if (StringUtils.isNotBlank(info)) { + result += "\nInformation:\n\t" + info + "\n"; } // Statistic String v = getStatistic(); if (v != null) { - result += "Statistic:\n" + v + "\n"; + result += "\nStatistic:\n" + v + "\n"; } // Optimisation usage Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-07-22 09:01:49 UTC (rev 4053) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-07-22 19:54:22 UTC (rev 4054) @@ -75,6 +75,10 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.rule.RuleHelper; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; +import fr.ifremer.isisfish.util.ConverterUtil; +import fr.ifremer.isisfish.util.StringConverter; +import fr.ifremer.isisfish.util.TopiaEntityConverter; +import org.apache.commons.beanutils.ConvertUtilsBean; import static org.nuiton.i18n.I18n.n; @@ -90,7 +94,7 @@ public class SimulationParameterImpl implements SimulationParameter { /** Logger for this class. */ - private static Log log = LogFactory.getLog(SimulationParameterImpl.class); + final private static Log log = LogFactory.getLog(SimulationParameterImpl.class); /** Remember last read properties. */ protected Properties propertiesParameters; @@ -310,10 +314,10 @@ List groups = pop.getPopulationGroup(); List zones = pop.getPopulationZone(); - if (groups.size() == 0) { + if (groups.isEmpty()) { groups.add("No group"); } - if (zones.size() == 0) { + if (zones.isEmpty()) { zones.add("No zone"); } List[] semantics = new List[] { groups, zones }; @@ -373,10 +377,10 @@ PopulationDAO populationDAO = IsisFishDAOHelper .getPopulationDAO(tx); - String[] populationList = propertiesParameters.getProperty( - "populations", "").split(","); + String[] populationList = SimulationParameterPropertiesHelper + .getPopulationNames(propertiesParameters); for (String name : populationList) { - if (name != null && !"".equals(name)) { + if (StringUtils.isNotEmpty(name)) { try { Population population = populationDAO.findByName(name); populations.add(population); @@ -448,7 +452,8 @@ } StrategyDAO strategyDAO = IsisFishDAOHelper.getStrategyDAO(tx); - String[] strategyList = propertiesParameters.getProperty("strategies", "").split(","); + String[] strategyList = SimulationParameterPropertiesHelper + .getStrategieNames(propertiesParameters); for (String name : strategyList) { if (name != null && !"".equals(name)) { try { @@ -617,7 +622,8 @@ } // rules - String[] ruleList = propertiesParameters.getProperty("rules", "").split(","); + String[] ruleList = SimulationParameterPropertiesHelper + .getRuleNames(propertiesParameters); int ruleIndex = 0; for (String name : ruleList) { if (name != null && !"".equals(name)) { @@ -685,7 +691,7 @@ useCache = Boolean.TRUE; } } - return useCache.booleanValue(); + return useCache; } @Override @@ -758,11 +764,11 @@ numberOfSensitivitySimulation = Integer.valueOf(propertiesParameters.getProperty( "numberOfSensitivitySimulation", "-1")); } else { - numberOfSensitivitySimulation = Integer.valueOf(-1); + numberOfSensitivitySimulation = -1; } } - return numberOfSensitivitySimulation.intValue(); + return numberOfSensitivitySimulation; } /* @@ -925,7 +931,7 @@ useOptimization = Boolean.FALSE; } } - return useOptimization.booleanValue(); + return useOptimization; } @Override @@ -976,7 +982,7 @@ if (propertiesParameters != null) { try { // On verifie tout d'abord que l'on ai pas dans une simulation - // si on y es, on utilise le context static non null du thread local + // si on y est, on utilise le context static non null du thread local // Resoud les lazy exceptions des parametres des regles boolean mustClose = false; TopiaContext tx = SimulationContext.get().getDB(); @@ -989,6 +995,7 @@ // rules String[] optimizationExportList = propertiesParameters.getProperty("optimizationexports", "").split(","); + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(tx); int optimizationExportIndex = 0; for (String name : optimizationExportList) { if (name != null && !"".equals(name)) { @@ -997,7 +1004,7 @@ Observation observation = null; String observationId = propertiesParameters.getProperty("optimizationobservation." + optimizationExportIndex); if (StringUtils.isNotBlank(observationId)) { - observation = (Observation)tx.findByTopiaId(observationId); + observation = (Observation)beanUtils.convert(observationId, TopiaEntity.class); } optimizationExportsObservations.put(export, observation); } catch (IsisFishException eee) { @@ -1066,11 +1073,11 @@ if (propertiesParameters != null) { simulationPlanNumber = Integer.valueOf(propertiesParameters.getProperty("simulationPlanNumber", "-1")); } else { - simulationPlanNumber = Integer.valueOf(-1); + simulationPlanNumber = -1; } } - return simulationPlanNumber.intValue(); + return simulationPlanNumber; } /* @@ -1092,7 +1099,7 @@ } } - return sensitivityAnalysisOnlyKeepFirst.booleanValue(); + return sensitivityAnalysisOnlyKeepFirst; } @Override @@ -1111,10 +1118,10 @@ if (propertiesParameters != null) { numberOfYear = Integer.valueOf(propertiesParameters.getProperty("numberOfYear", "1")); } else { - numberOfYear = Integer.valueOf(1); + numberOfYear = 1; } } - return numberOfYear.intValue(); + return numberOfYear; } /* @@ -1140,7 +1147,7 @@ } } - return usePreScript.booleanValue(); + return usePreScript; } /* @@ -1596,7 +1603,7 @@ */ @Override public String toString() { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append( t("isisfish.params.toString.simulation.done", getIsisFishVersion())).append('\n'); @@ -1738,13 +1745,13 @@ result.append(getPreScript()); result.append('\n'); result.append(t("isisfish.params.toString.simul.logger.level", - simulLogLevel)); + getSimulLogLevel())); result.append('\n'); result.append(t("isisfish.params.toString.script.logger.level", - scriptLogLevel)); + getScriptLogLevel())); result.append('\n'); result.append(t("isisfish.params.toString.lib.logger.level", - libLogLevel)); + getLibLogLevel())); result.append('\n'); return result.toString(); } @@ -1893,6 +1900,7 @@ if (optimizationExportsObservations != null) { String optimizationExportsList = ""; int optimizationExportIndex = 0; + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null); for (Map.Entry<Export, Observation> exportObservationEntry : optimizationExportsObservations.entrySet()) { Export export = exportObservationEntry.getKey(); optimizationExportsList += ExportStorage.getName(export) + ","; @@ -1900,7 +1908,7 @@ // add in props observation id export index Observation observation = exportObservationEntry.getValue(); if (observation != null) { - result.setProperty("optimizationobservation." + optimizationExportIndex, observation.getTopiaId()); + result.setProperty("optimizationobservation." + optimizationExportIndex, beanUtils.convert(observation)); } optimizationExportIndex++; } Added: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java 2014-07-22 19:54:22 UTC (rev 4054) @@ -0,0 +1,347 @@ +package fr.ifremer.isisfish.simulator; + + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.VersionUtil; + +import static org.nuiton.i18n.I18n.t; + +/** + * Class utilitaire permettant de travailler avec les parametres sous forme de + * properties + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SimulationParameterPropertiesHelper { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(SimulationParameterPropertiesHelper.class); + + final public static String ISIS_FISH_VERSION_KEY = "isisFishVersion"; + final public static String SIMULATOR_NAME_KEY = "simulatorName"; + final public static String POPULATIONS_KEY = "populations"; + final public static String RULES_KEY = "rules"; + final public static String PLANS_KEY = "plans"; + final public static String STRATEGIES_KEY = "strategies"; + final public static String DESCRIPTION_KEY = "description"; + final public static String REGION_NAME_KEY = "regionName"; + final public static String USE_SIMULATION_PLAN_KEY = "useSimulationPlan"; + final public static String SIMULATION_PLAN_NUMBER_KEY = "simulationPlanNumber"; + final public static String USE_OPTIMIZATION_KEY = "useOptimization"; + final public static String OPTIMIZATION_KEY = "optimization"; + final public static String OBJECTIVE_KEY = "objective"; + final public static String OPTIMIZATION_EXPORTS_KEY = "optimizationexports"; + final public static String USE_CACHE_KEY = "useCache"; + final public static String NUMBER_OF_YEAR_KEY = "numberOfYear"; + final public static String GENERATED_PRE_SCRIPT_KEY = "generatedPreScript"; + final public static String PRE_SCRIPT_KEY = "preScript"; + final public static String SIMUL_LOG_LEVEL_KEY = "simulLogLevel"; + final public static String SCRIPT_LOG_LEVEL_KEY = "simulLogLevel"; + final public static String LIB_LOG_LEVEL_KEY = "simulLogLevel"; + + public static String getIsisFishVersion(Properties prop) { + String result = prop.getProperty(ISIS_FISH_VERSION_KEY, ""); + return result; + } + + public static String getSimulatorName(Properties prop) { + String result = prop.getProperty(SIMULATOR_NAME_KEY, "DefaultSimulator.java"); + return result; + } + + public static String getDescription(Properties prop) { + String result = prop.getProperty(DESCRIPTION_KEY, ""); + return result; + } + + public static boolean getUseSimulationPlan(Properties prop) { + boolean result = Boolean.valueOf(prop.getProperty(USE_SIMULATION_PLAN_KEY, "false")); + return result; + } + + public static int getSimulationPlanNumber(Properties prop) { + int result = Integer.valueOf(prop.getProperty(SIMULATION_PLAN_NUMBER_KEY, "-1")); + return result; + } + + public static boolean getUseCache(Properties prop) { + boolean result; + if (VersionUtil.smallerThan(getIsisFishVersion(prop), "4.3.0.0")) { + result = Boolean.valueOf(prop.getProperty(USE_OPTIMIZATION_KEY, "true")); + } else { + result = Boolean.valueOf(prop.getProperty(USE_CACHE_KEY, "true")); + } + return result; + } + + public static int getNumberOfYear(Properties prop) { + int result = Integer.valueOf(prop.getProperty(NUMBER_OF_YEAR_KEY, "1")); + return result; + } + + public static String getRegionName(Properties prop) { + String result = prop.getProperty(REGION_NAME_KEY, ""); + return result; + } + + public static String[] getPopulationNames(Properties prop) { + String[] result = prop.getProperty(POPULATIONS_KEY, "").split(","); + return result; + } + + public static String[] getStrategieNames(Properties prop) { + String[] result = prop.getProperty(STRATEGIES_KEY, "").split(","); + return result; + } + + public static String[] getRuleNames(Properties prop) { + String[] result = prop.getProperty(RULES_KEY, "").split(","); + return result; + } + + public static String[] getSimulationPlanNames(Properties prop) { + String[] result = prop.getProperty(PLANS_KEY, "").split(","); + return result; + } + + private static boolean getUseOptimization(Properties prop) { + boolean result; + // en version < 4.3, le parametre était nommé 'useOptimization' + // qualifiant le cache, il a été renommé ensuite + if (VersionUtil.smallerThan(getIsisFishVersion(prop), "4.3.0.0")) { + result = Boolean.FALSE; + } else { + result = Boolean.valueOf(prop.getProperty(USE_OPTIMIZATION_KEY, "false")); + } + return result; + } + + public static String getOptimizationName(Properties prop) { + String result = prop.getProperty(OPTIMIZATION_KEY, ""); + return result; + } + + public static String getObjectiveName(Properties prop) { + String result = prop.getProperty(OBJECTIVE_KEY, ""); + return result; + } + + public static String[] getOptimizationExportNames(Properties prop) { + String[] result = prop.getProperty(OPTIMIZATION_EXPORTS_KEY, "").split(","); + return result; + } + + public static String getOptimizationObservationName(Properties prop, int index) { + String result = prop.getProperty("optimizationobservation" + "." + index, ""); + if (result.matches("[\\w.]+#[\\d.]+#[\\d.]+:(.+)")) { + result = result.replaceFirst("[\\w.]+#[\\d.]+#[\\d.]+:(.+)", "$1"); + } + + return result; + } + + public static String getGeneratedPreScript(Properties prop) { + String result = prop.getProperty(GENERATED_PRE_SCRIPT_KEY, ""); + return result; + } + + public static String getPreScript(Properties prop) { + String result = prop.getProperty(PRE_SCRIPT_KEY, ""); + return result; + } + + public static String getSimulLogLevel(Properties prop) { + String result = prop.getProperty(SIMUL_LOG_LEVEL_KEY, "info"); + return result; + } + + public static String getScriptLogLevel(Properties prop) { + String result = prop.getProperty(SCRIPT_LOG_LEVEL_KEY, "info"); + return result; + } + + public static String getLibLogLevel(Properties prop) { + String result = prop.getProperty(LIB_LOG_LEVEL_KEY, "info"); + return result; + } + + /** + * Retourne les parametres sous forme de String pour une regles. Les regles + * sont numeroter dans l'ordre dans lequel on les recupere via #getRuleNames(). + * + * @param prop + * @param prefix can be 'rule', or other + * @param index l'indice de la regle dont on veut les parametre en String + * @return + */ + public static Map<String, String> getParamAsString(Properties prop, String prefix, int index) { + Map<String, String> result = new HashMap<String, String>(); + if (prop != null) { + String paramTag = prefix + "." + index + ".parameter."; + int paramTagLength = paramTag.length(); + + for (String key : prop.stringPropertyNames()) { + if (StringUtils.startsWith(key, paramTag)) { + String paramName = key.substring(paramTagLength); + String value = prop.getProperty(key); + // get only string representation of entities + if (value.matches("[\\w.]+#[\\d.]+#[\\d.]+:(.+)")) { + value = value.replaceFirst("[\\w.]+#[\\d.]+#[\\d.]+:(.+)", "$1"); + } + result.put(paramName, value); + } + } + } + + return result; + } + + public static String toString(Properties prop) { + StringBuilder result = new StringBuilder(); + result.append( + t("isisfish.params.toString.simulation.done", + getIsisFishVersion(prop))).append(" (").append(getSimulatorName(prop)).append(")").append('\n'); + result.append("--------------------\n"); + result.append(getDescription(prop)).append('\n'); + result.append("--------------------\n"); + + if (getUseSimulationPlan(prop)) { + result.append(t("isisfish.params.toString.plan.number", + getSimulationPlanNumber(prop))); + result.append("\n"); + } + + result.append("\n"); + + boolean useCache = getUseCache(prop); + if (useCache) { + result.append(t("isisfish.params.toString.use.cache", + useCache)); + result.append("\n"); + } + + result.append(t("isisfish.params.toString.fishery", getRegionName(prop))); + result.append("\n\n"); + result.append(t("isisfish.params.toString.number.years", + getNumberOfYear(prop))); + result.append("\n\n"); + + // startegies + String[] strs = getStrategieNames(prop); + result.append(t("isisfish.params.toString.strategies")); + String sep = ""; + for (String str : strs) { + result.append(sep).append(str); + sep = ","; + } + result.append("\n\n"); + + // populations + result.append(t("isisfish.params.toString.populations")); + sep = ""; + for (String pop : getPopulationNames(prop)) { + result.append(sep).append(pop); + sep = ","; + } + result.append("\n\n"); + + // rules + int cpt = 0; + for (String name : getRuleNames(prop)) { + result.append(t("isisfish.params.toString.rule", name)); + result.append('\n'); + for (Map.Entry<String, String> e : getParamAsString(prop, "rule", cpt++).entrySet()) { + result.append("\t").append(e.getKey()).append(" : ").append(e.getValue()).append("\n"); + } + result.append("\n"); + + } + result.append("\n\n"); + + // simulation plans + cpt = 0; + for (String plan : getSimulationPlanNames(prop)) { + result.append(t("isisfish.params.toString.plan", plan)); + result.append('\n'); + for (Map.Entry<String, String> e : getParamAsString(prop, "plan", cpt++).entrySet()) { + result.append("\t").append(e.getKey()).append(" : ").append(e.getValue()).append("\n"); + } + result.append('\n'); + + } + + boolean useOptimization = getUseOptimization(prop); + + if (useOptimization) { + result.append(t("isisfish.params.toString.use.optimization", + useOptimization)); + + String objective = getObjectiveName(prop); + if (StringUtils.isNotBlank(objective)) { + result.append(t("isisfish.params.toString.objective", objective)); + result.append('\n'); + for (Map.Entry<String, String> e : getParamAsString(prop, OBJECTIVE_KEY, 0).entrySet()) { + result.append("\t").append(e.getKey()).append(" : ").append(e.getValue()).append("\n"); + } + result.append('\n'); + } + + String optimization = getOptimizationName(prop); + if (StringUtils.isNotBlank(optimization)) { + result.append(t("isisfish.params.toString.optimization", optimization)); + result.append('\n'); + for (Map.Entry<String, String> e : getParamAsString(prop, OPTIMIZATION_KEY, 0).entrySet()) { + result.append("\t").append(e.getKey()).append(" : ").append(e.getValue()).append("\n"); + } + result.append('\n'); + } + + cpt = 0; + for (String export : getOptimizationExportNames(prop)) { + String observation = getOptimizationObservationName(prop, cpt++); + + result.append(t("isisfish.params.toString.optimizationExport", export)); + if (StringUtils.isNotBlank(observation)) { + result.append("\t->").append(t("isisfish.params.toString.optimizationObservation", observation)); + } + result.append('\n'); + } + } + + String genScript = getGeneratedPreScript(prop); + if (StringUtils.isNotBlank(genScript)) { + result.append('\n'); + result.append(t("isisfish.params.toString.script.generatedpresimulation")) + .append(":\n"); + result.append(genScript); + } + String prescript = getPreScript(prop); + if (StringUtils.isNotBlank(prescript)) { + result.append('\n'); + result.append(t("isisfish.params.toString.script.presimulation")) + .append(":\n"); + result.append(prescript); + } + result.append('\n'); + result.append(t("isisfish.params.toString.simul.logger.level", + getSimulLogLevel(prop))); + result.append('\n'); + result.append(t("isisfish.params.toString.script.logger.level", + getScriptLogLevel(prop))); + result.append('\n'); + result.append(t("isisfish.params.toString.lib.logger.level", + getLibLogLevel(prop))); + result.append('\n'); + return result.toString(); + } + +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2014-07-22 09:01:49 UTC (rev 4053) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2014-07-22 19:54:22 UTC (rev 4054) @@ -27,7 +27,6 @@ import static org.nuiton.i18n.I18n.n; import java.awt.Component; -import java.util.Iterator; import javax.swing.Icon; import javax.swing.JScrollPane; @@ -40,7 +39,9 @@ import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper; import fr.ifremer.isisfish.types.TimeStep; +import java.util.Properties; /** * Simulation summary renderer. @@ -79,11 +80,12 @@ if (cachedComponent == null) { SimulationParameter sp = simulationStorage.getParameter(); - StringBuffer resume = new StringBuffer(sp.toString()); + Properties prop = sp.toProperties(); + String params = SimulationParameterPropertiesHelper.toString(prop); + StringBuilder resume = new StringBuilder(params); resume.append("\n"); - for(Iterator<String> i = resultStorage.getResultName().iterator(); i.hasNext();) { - String name = (String)i.next(); + for(String name : resultStorage.getResultName()) { try { // TODO EC20090717 ca marche plus ca Modified: trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2014-07-22 09:01:49 UTC (rev 4053) +++ trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2014-07-22 19:54:22 UTC (rev 4054) @@ -58,7 +58,8 @@ Object result = null; if (o != null) { if (o instanceof TopiaEntity) { - result = ((TopiaEntity) o).getTopiaId(); + // put after ':' string entity representation + result = ((TopiaEntity) o).getTopiaId() + ":" + o.toString(); } else if (o instanceof TimeStep) { result = String.valueOf(((TimeStep) o).getStep()); } else if (o instanceof Month) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2014-07-22 09:01:49 UTC (rev 4053) +++ trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2014-07-22 19:54:22 UTC (rev 4054) @@ -29,6 +29,7 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; @@ -69,6 +70,8 @@ if (value instanceof TopiaEntity) { result = value; } else if (value instanceof String) { + // after ':' is entity string representation + value = StringUtils.substringBefore((String)value, ":"); result = getTopiaEntity((String) value); } else { throw new ConversionException("Can't convert '" + value + "' to " + type.getName()); Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-22 09:01:49 UTC (rev 4053) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-22 19:54:22 UTC (rev 4054) @@ -697,20 +697,20 @@ isisfish.params.simulationName=Simulation name isisfish.params.stategiesAndPopulations=Strategies and populations isisfish.params.title=Parameters -isisfish.params.toString.fishery=Fishery\: %1$s\n\n +isisfish.params.toString.fishery=Fishery\: %1$s isisfish.params.toString.lib.logger.level=Level of libraries' logger \: %1$s -isisfish.params.toString.number.years=Number of years\: %1$s\n\n +isisfish.params.toString.number.years=Number of years\: %1$s isisfish.params.toString.objective= isisfish.params.toString.optimization= isisfish.params.toString.optimizationExport= isisfish.params.toString.optimizationObservation= isisfish.params.toString.plan=Plan\: %1$s -isisfish.params.toString.plan.number=Simulation plan sequence number\: %1$s\n\n +isisfish.params.toString.plan.number=Simulation plan sequence number\: %1$s isisfish.params.toString.populations=Populations \: isisfish.params.toString.rule=Rule\: %1$s -isisfish.params.toString.script.generatedpresimulation= +isisfish.params.toString.script.generatedpresimulation=Generated script isisfish.params.toString.script.logger.level=Level of scripts' logger \: %1$s -isisfish.params.toString.script.presimulation=Script de presimulation +isisfish.params.toString.script.presimulation=Pre-simulation script isisfish.params.toString.simul.logger.level=Level of simulator's logger \: %1$s isisfish.params.toString.simulation.done=Simulation done with \: %1$s isisfish.params.toString.strategies=Strategies \: Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-22 09:01:49 UTC (rev 4053) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-22 19:54:22 UTC (rev 4054) @@ -692,18 +692,18 @@ isisfish.params.simulationName=Nom de la simulation isisfish.params.stategiesAndPopulations=Stratégies et populations isisfish.params.title=Paramètres -isisfish.params.toString.fishery=Pêcherie\: %s\n\n +isisfish.params.toString.fishery=Pêcherie\: %s isisfish.params.toString.lib.logger.level=niveau du logger de librairies \: %s -isisfish.params.toString.number.years=Nombre d'années \: %s\n\n +isisfish.params.toString.number.years=Nombre d'années \: %s isisfish.params.toString.objective=Fonction d'objectif \: %s isisfish.params.toString.optimization=Méthode d'optimisation \: %s isisfish.params.toString.optimizationExport=Export d'optimisation \: %s isisfish.params.toString.optimizationObservation=Observation d'optimisation \: %s isisfish.params.toString.plan=Plan\: %s -isisfish.params.toString.plan.number=Numéro de séquence dans le plan \: %s\n\n +isisfish.params.toString.plan.number=Numéro de séquence dans le plan \: %s isisfish.params.toString.populations=Populations \: isisfish.params.toString.rule=Règle\: %s -isisfish.params.toString.script.generatedpresimulation= +isisfish.params.toString.script.generatedpresimulation=Script généré isisfish.params.toString.script.logger.level=niveau du logger de scripts \: %1$s isisfish.params.toString.script.presimulation=Script de presimulation isisfish.params.toString.simul.logger.level=niveau du logger de simulateur \: %1$s

1 0

r4053 - trunk/src/main/java/fr/ifremer/isisfish/ui/util
by bpoussin＠users.forge.codelutin.com 22 Jul '14

22 Jul '14

Author: bpoussin Date: 2014-07-22 11:01:49 +0200 (Tue, 22 Jul 2014) New Revision: 4053 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4053 Log: with normal stackTrace is more readeable Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2014-07-21 11:02:35 UTC (rev 4052) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2014-07-22 09:01:49 UTC (rev 4053) @@ -68,8 +68,11 @@ public static void showErrorDialog(Component parent, String message, Throwable cause) { JXErrorPane pane = new JXErrorPane(); + + String details = "<pre>\n" + getDetails(cause) + "\n</pre>"; + ErrorInfo info = new ErrorInfo(t("isisfish.error.errorpane.title"), - t("isisfish.error.errorpane.htmlmessage", message), null, null, + t("isisfish.error.errorpane.htmlmessage", message), details, null, cause, null, null); pane.setErrorInfo(info); if (cause != null) { @@ -97,6 +100,18 @@ showErrorDialog(null, message, cause); } + private static String getDetails(Throwable cause) { + String result = ""; + if (cause != null) { + StringWriter out = new StringWriter(); + PrintWriter writer = new PrintWriter(out); + cause.printStackTrace(writer); + out.flush(); + result = out.toString(); + } + return result; + } + /* * @see org.jdesktop.swingx.error.ErrorReporter#reportError(org.jdesktop.swingx.error.ErrorInfo) */ @@ -137,10 +152,7 @@ } // message exception - StringWriter out = new StringWriter(); - PrintWriter writer = new PrintWriter(out); - errorInfo.getErrorException().printStackTrace(writer); - message += formatMessage("Exception", out.toString()); + message += formatMessage("Exception", getDetails(errorInfo.getErrorException())); // TODO i18n files are iso encoded :( email.setContent(message, "text/plain; charset=ISO-8859-9");

1 0

r4052 - trunk/src/main/java/fr/ifremer/isisfish/entities
by bpoussin＠users.forge.codelutin.com 21 Jul '14

21 Jul '14

Author: bpoussin Date: 2014-07-21 13:02:35 +0200 (Mon, 21 Jul 2014) New Revision: 4052 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4052 Log: fixes #5464 - NPE in method StrategyMonthInfoImpl#getMetierWithProportion() Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-21 11:01:58 UTC (rev 4051) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-21 11:02:35 UTC (rev 4052) @@ -39,6 +39,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; +import java.util.Collections; import org.nuiton.math.matrix.MatrixIterator; /** @@ -73,9 +74,14 @@ @Override public List<Metier> getMetierWithProportion() { MatrixND mat = super.getProportionMetier(); - List<Metier> result = new ArrayList<Metier>(mat.getDim(0)); - for (MatrixIterator i=mat.iteratorNotZero(); i.next();) { - result.add((Metier)i.getSemanticsCoordinates()[0]); + List<Metier> result; + if (mat == null) { + result = Collections.EMPTY_LIST; + } else { + result = new ArrayList<Metier>(mat.getDim(0)); + for (MatrixIterator i=mat.iteratorNotZero(); i.next();) { + result.add((Metier)i.getSemanticsCoordinates()[0]); + } } return result; }

1 0

r4051 - in trunk/src/main/java/fr/ifremer/isisfish: datastore ui/result
by bpoussin＠users.forge.codelutin.com 21 Jul '14

21 Jul '14

Author: bpoussin Date: 2014-07-21 13:01:58 +0200 (Mon, 21 Jul 2014) New Revision: 4051 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4051 Log: add @Override and fixme comment Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2014-07-21 10:35:11 UTC (rev 4050) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2014-07-21 11:01:58 UTC (rev 4051) @@ -207,6 +207,7 @@ * return list of all result name available * @return */ + @Override abstract public List<String> getResultName(); /** Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-07-21 10:35:11 UTC (rev 4050) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-07-21 11:01:58 UTC (rev 4051) @@ -218,6 +218,10 @@ resultSimulationFrame.getMatrixViewerContainer().add(matrixViewerPanel, BorderLayout.CENTER); if (model.getSize() > 0) { + // FIXME poussin 20140721 est-ce bien intelligent de forcer l'ouverture + // du 1er resultat trouver. On prend du temps pour ca, alors que l'utilisateur + // veut potentiellement regarder autre chose. Demander au utilisateur si on peut + // ne pas ouvrir de resultat par defaut. model.setSelectedItem(model.getElementAt(0)); } } catch (TopiaException ex) {

1 0

r4050 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by bpoussin＠users.forge.codelutin.com 21 Jul '14

21 Jul '14

Author: bpoussin Date: 2014-07-21 12:35:11 +0200 (Mon, 21 Jul 2014) New Revision: 4050 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4050 Log: if no result return null for getMatrix(name, tx) Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2014-07-20 20:26:44 UTC (rev 4049) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2014-07-21 10:35:11 UTC (rev 4050) @@ -558,6 +558,11 @@ } } + // s'il n'y pas de resultat, on retourne null + if (sample == null) { + return null; + } + // creation des dimensions String[] dimNames = new String[1 + sample.getDimCount()]; dimNames[0] = t("isisfish.common.date");

1 0

r4049 - branches/4.3.0-log4j2/src/main/resources
by echatellier＠users.forge.codelutin.com 20 Jul '14

20 Jul '14

Author: echatellier Date: 2014-07-20 22:26:44 +0200 (Sun, 20 Jul 2014) New Revision: 4049 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4049 Log: Switch to log4j2 (testing) Added: branches/4.3.0-log4j2/src/main/resources/log4j2.xml Added: branches/4.3.0-log4j2/src/main/resources/log4j2.xml =================================================================== (Binary files differ) Property changes on: branches/4.3.0-log4j2/src/main/resources/log4j2.xml ___________________________________________________________________ Added: svn:mime-type + application/xml

1 0

r4048 - in branches: . 4.3.0-log4j2 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging 4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher 4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging
by echatellier＠users.forge.codelutin.com 20 Jul '14

20 Jul '14

Author: echatellier Date: 2014-07-20 22:25:48 +0200 (Sun, 20 Jul 2014) New Revision: 4048 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4048 Log: Switch to log4j2 (testing) Added: branches/4.3.0-log4j2/ Modified: branches/4.3.0-log4j2/pom.xml branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisFish.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java Property changes on: branches/4.3.0-log4j2 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea Added: svn:mergeinfo + /branches/4.0.0-svnkit:3665-3698 /branches/4.0.1:3616-3968 /branches/4.1:3601-3670 Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- trunk/pom.xml 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/pom.xml 2014-07-20 20:25:48 UTC (rev 4048) @@ -213,29 +213,37 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.7</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <version>1.2</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.0</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>2.0</version> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.7</version> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.0</version> + <scope>runtime</scope> </dependency> <dependency> Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -1000,10 +1000,10 @@ } /** - * Seuil d'uitilisation des matrices creuse + * Seuil d'utilisation des matrices creuse * * @return - * @since 4.2.0.2 + * @since 4.3.1.0 */ public int getSimulationMatrixThresholdUseSparse() { ApplicationConfig config = SimulationContext.get().getConfig(); @@ -1012,7 +1012,7 @@ } /** - * Seuil d'uitilisation des matrices creuse + * Seuil d'utilisation des matrices creuse * * @return * @since 4.3.1.0 @@ -1028,7 +1028,7 @@ * de temps. * * @return - * @since 4.2.0.2 + * @since 4.3.1.0 */ public int getSimulationStoreResultOnDisk() { ApplicationConfig config = SimulationContext.get().getConfig(); @@ -1040,7 +1040,7 @@ * Indique le nombre de pas qui doivent rester en memoire durant la simulation * * @return - * @since 4.2.0.2 + * @since 4.3.1.0 */ public int getSimulationStoreResultCacheStep() { ApplicationConfig config = SimulationContext.get().getConfig(); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/IsisFish.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -121,6 +121,9 @@ public static void main(String... args) throws Exception { + // TODO as of 20140720, hibernate fails to detect log4j 2.0, force slf4j + System.setProperty("org.jboss.logging.provider", "slf4j"); + // permet de faire fonctionner la compilation en webstart System.setSecurityManager(null); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -41,6 +41,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.ThreadContext; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; @@ -880,7 +881,7 @@ public void addSimulationLogger(String simulLogLevel, String scriptLogLevel, String libLogLevel, String threadName) { - try { + /*try { SimulationLoggerUtil.addSimulationAppender(getSimulationLogFile(), getAppenderId(), simulLogLevel, scriptLogLevel, libLogLevel, threadName); @@ -889,7 +890,13 @@ useLog = false; log.warn(t("Can't create simulation logger", eee)); // we do not throw any exception, this is a shame but not required - } + }*/ + + ThreadContext.put("contextId", name); + ThreadContext.put("contextLogFile", getSimulationLogFile()); + ThreadContext.put("contextSimulLevel", simulLogLevel); + ThreadContext.put("contextScriptLevel", scriptLogLevel); + ThreadContext.put("contextLibLevel", libLogLevel); } /** @@ -897,12 +904,12 @@ */ public void removeSimulationLogger() { - try { + /*try { String appenderId = getAppenderId(); SimulationLoggerUtil.removeSimulationAppender(appenderId); } finally { useLog = false; - } + }*/ } /** Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -74,7 +74,7 @@ public List<Metier> getMetierWithProportion() { MatrixND mat = super.getProportionMetier(); List<Metier> result = new ArrayList<Metier>(mat.getDim(0)); - for (MatrixIterator i=mat.iteratorNotZero(); i.next();) { + for (MatrixIterator i = mat.iteratorNotZero(); i.next();) { result.add((Metier)i.getSemanticsCoordinates()[0]); } return result; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,17 +25,6 @@ package fr.ifremer.isisfish.logging; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.logging.console.LogConsole; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Appender; -import org.apache.log4j.FileAppender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; import static org.nuiton.i18n.I18n.t; import java.io.File; @@ -44,6 +33,23 @@ import java.util.HashMap; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.appender.FileAppender; +import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.DefaultConfiguration; +import org.apache.logging.log4j.core.layout.PatternLayout; + +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.logging.console.LogConsole; + /** * FIXME poussin, a priori cette classe ne supporte pas plusieurs simulation * en meme temps, ce qui est le cas si on a plusieurs processeurs de dispo :( @@ -115,8 +121,9 @@ String libLogLevel, String threadName) throws IsisFishException { - PatternLayout layout = new PatternLayout(); - layout.setConversionPattern(LOG_PATTERN); + PatternLayout layout = PatternLayout.newBuilder() + .withPattern(LOG_PATTERN) + .build(); ThreadFilter filter = new ThreadFilter(threadName); @@ -124,25 +131,43 @@ scriptLevelKeeper = prepareLogger(scriptLogLevel, scriptLoggerToChange); libLevelKeeper = prepareLogger(libLogLevel, libLoggerToChange); - //TODO See if we use should use the buffered version : define buffer size + Configuration configuration = new DefaultConfiguration(); + //try { + //FileAppender appender = new FileAppender(layout, filename, false); + FileAppender appender = FileAppender.createAppender(filename, + "false" /*append*/, + "false" /*locking*/, + threadName /*name*/, + "true" /*immediateFlush*/, + "true" /*ignore*/, + "true" /*bufferedIo*/, + "8192" /*bufferSizeStr*/, + layout, + filter, + "false" /*advertise*/, + threadName /*advertiseUri*/, + configuration); + + //appender.setName(appenderId); - try { - FileAppender appender = new FileAppender(layout, filename, false); - appender.setName(appenderId); - // thread filter come first - appender.addFilter(filter); + //appender.addFilter(filter); // add the appender to the root appender - Logger.getRootLogger().addAppender(appender); + //Logger.getRootLogger().addAppender(appender); + configuration.addAppender(appender); + LoggerContext context = (LoggerContext) LogManager.getContext(); + context.start(configuration); + context.updateLoggers(); + if (log.isDebugEnabled()) { log.debug(t("isisfish.log.addAppender", appenderId)); } - } catch (IOException ex) { + /*} catch (IOException ex) { log.error(t("isisfish.error.log.createAppender", appenderId, ex.getMessage())); throw new IsisFishException("Can't add appender", ex); - } + }*/ } @@ -203,7 +228,7 @@ */ static Map<String, Level> prepareLogger(String logLevel, String[] categoriesToChange) { Map<String, Level> result = new HashMap<String, Level>(); - Enumeration enumeration; + /*Enumeration enumeration; Level level = Level.toLevel(logLevel); @@ -226,7 +251,7 @@ } } } - } + }*/ return result; } @@ -236,7 +261,7 @@ * @param levelKeeper the dico of categories to swap back to original levels */ static void retablishLogger(Map<String, Level> levelKeeper) { - Logger rootLogger = Logger.getRootLogger(); + /*Logger rootLogger = Logger.getRootLogger(); for (Map.Entry<String, Level> entry : levelKeeper.entrySet()) { Logger logger = rootLogger.getLoggerRepository().getLogger(entry.getKey()); if (logger != null) { @@ -247,7 +272,7 @@ logger.setLevel(oldLevel); } } - levelKeeper.clear(); + levelKeeper.clear();*/ } /** @@ -260,7 +285,7 @@ */ static void removeAppender(String category, String name) { // get logger for the category - Logger logger = category == null ? Logger.getRootLogger() : Logger.getLogger(category); + /*Logger logger = category == null ? Logger.getRootLogger() : Logger.getLogger(category); if (logger == null) { Logger.getRootLogger().warn(t("isisfish.error.log.closeAppender", name, category)); return; @@ -275,6 +300,6 @@ // close appender app.close(); // and remove it from the logger - logger.removeAppender(app); + logger.removeAppender(app);*/ } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,27 +25,45 @@ package fr.ifremer.isisfish.logging; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.Logger; +import org.apache.logging.log4j.core.filter.AbstractFilter; +import org.apache.logging.log4j.message.Message; + /** * this class is Log4J filter to accept only incoming log events from a unique thread. * it retains all logEvent coming from other threads (compare with given thread name). * * @author chemit */ -public class ThreadFilter extends org.apache.log4j.spi.Filter { +public class ThreadFilter extends AbstractFilter { /** the name of the only thread to accept */ protected String threadName; public ThreadFilter(String threadName) { - this.threadName=threadName; + this.threadName = threadName; } - public int decide(org.apache.log4j.spi.LoggingEvent event) { - // only accept event coming from a specific thread - return event.getThreadName().equals(threadName) ? ACCEPT : DENY; + @Override + public Result filter(LogEvent event) { + return event.getThreadName().equals(threadName) ? Result.ACCEPT : Result.DENY; } - - public void setThreadName(String threadName) { - this.threadName = threadName; + + @Override + public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { + throw new UnsupportedOperationException("filter"); } + + @Override + public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { + throw new UnsupportedOperationException("filter"); + } + + @Override + public Result filter(Logger logger, Level level, Marker marker, String msg, Object... params) { + throw new UnsupportedOperationException("filter"); + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -227,14 +227,14 @@ String simulLogLevel = simulation.getParameter().getSimulLogLevel(); String scriptLogLevel = simulation.getParameter().getScriptLogLevel(); String libLogLevel = simulation.getParameter().getLibLogLevel(); - try { + /*try { simulation.addSimulationLogger(simulLogLevel, scriptLogLevel, libLogLevel, simThread.getName()); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn(t("isisfish.error.add.logger.simulation", e)); } - } + }*/ try { simThread.start(); try { @@ -263,6 +263,13 @@ @Override public void run() { + + String simulLogLevel = simulation.getParameter().getSimulLogLevel(); + String scriptLogLevel = simulation.getParameter().getScriptLogLevel(); + String libLogLevel = simulation.getParameter().getLibLogLevel(); + simulation.addSimulationLogger(simulLogLevel, scriptLogLevel, + libLogLevel, getName()); + simulation = localSimulateSameThread(control, simulation); } } Modified: branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2014-07-19 13:52:09 UTC (rev 4047) +++ branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2014-07-20 20:25:48 UTC (rev 4048) @@ -32,8 +32,9 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Test; @@ -63,7 +64,7 @@ String threadName = Thread.currentThread().getName(); // use a logger we know to be scan as been keep for original level - Logger hibernatelog = Logger.getLogger("org.hibernate"); + Logger hibernatelog = LogManager.getLogger("org.hibernate"); Level hibernateLogLevel = hibernatelog.getLevel(); @@ -82,7 +83,7 @@ ); // check hibernate level was not changed - Assert.assertEquals(hibernateLogLevel, Logger.getLogger("org.hibernate").getLevel()); + Assert.assertEquals(hibernateLogLevel, LogManager.getLogger("org.hibernate").getLevel()); final Log logger = LogFactory.getLog(appenderId); @@ -168,7 +169,7 @@ String threadName = Thread.currentThread().getName(); // use a logger we know to be scan as been keep for original level - Logger hibernatelog = Logger.getLogger("org.hibernate"); + Logger hibernatelog = LogManager.getLogger("org.hibernate"); Level hibernateLogLevel = hibernatelog.getLevel(); @@ -185,7 +186,7 @@ ); // check hibernate level was not changed - Assert.assertEquals(hibernateLogLevel, Logger.getLogger("org.hibernate").getLevel()); + Assert.assertEquals(hibernateLogLevel, LogManager.getLogger("org.hibernate").getLevel()); final Log logger = LogFactory.getLog(appenderId);

1 0

r4047 - trunk
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 15:52:09 +0200 (Sat, 19 Jul 2014) New Revision: 4047 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4047 Log: Update hibernate Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-19 10:44:45 UTC (rev 4046) +++ trunk/pom.xml 2014-07-19 13:52:09 UTC (rev 4047) @@ -484,7 +484,7 @@ <jaxxVersion>2.8.7</jaxxVersion> <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9.1</topiaVersion> - <hibernateVersion>4.3.5.Final</hibernateVersion> + <hibernateVersion>4.3.6.Final</hibernateVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r4046 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 12:44:45 +0200 (Sat, 19 Jul 2014) New Revision: 4046 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4046 Log: Readd "Zones" Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-19 10:37:46 UTC (rev 4045) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-19 10:44:45 UTC (rev 4046) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Strategies isisfish.input.tree.triptypes=Trip types isisfish.input.tree.vesseltypes=Vessel types -isisfish.input.tree.zones= +isisfish.input.tree.zones=Zones isisfish.launch.anonymous=read only isisfish.launch.email=email isisfish.launch.firstname=firstname @@ -729,7 +729,7 @@ isisfish.population.recruitment=Recruitment isisfish.population.reproduction=Reproduction isisfish.population.season=Season -isisfish.population.zones= +isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier isisfish.populationBasics.groupMax=Max group @@ -808,7 +808,7 @@ isisfish.populationZones.selectPopulationAreas=Select the population areas isisfish.populationZones.selectRecruitmentAreas=Select the recruitment areas isisfish.populationZones.selectSpawningAreas=Select the spawning areas -isisfish.populationZones.title= +isisfish.populationZones.title=Zones isisfish.port.cell=Port cell isisfish.port.comments=Comments isisfish.port.name=Name Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-19 10:37:46 UTC (rev 4045) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-19 10:44:45 UTC (rev 4046) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Stratégies isisfish.input.tree.triptypes=Types de marée isisfish.input.tree.vesseltypes=Types de navire -isisfish.input.tree.zones= +isisfish.input.tree.zones=Zones isisfish.launch.anonymous=lecture seule isisfish.launch.email=courriel isisfish.launch.firstname=nom @@ -724,7 +724,7 @@ isisfish.population.recruitment=Recrutement isisfish.population.reproduction=Reproduction isisfish.population.season=Saison -isisfish.population.zones= +isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique isisfish.populationBasics.groupMax=Group max @@ -803,7 +803,7 @@ isisfish.populationZones.selectPopulationAreas=Sélectionnez les zones des populations isisfish.populationZones.selectRecruitmentAreas=Sélectionnez les zones de recrutement isisfish.populationZones.selectSpawningAreas=Sélectionnez les zones de reproduction -isisfish.populationZones.title= +isisfish.populationZones.title=Zones isisfish.port.cell=Maille du port isisfish.port.comments=Commentaires isisfish.port.name=Nom

1 0

r4045 - trunk/src/main/java/fr/ifremer/isisfish/aspect
by echatellier＠users.forge.codelutin.com 19 Jul '14

19 Jul '14

Author: echatellier Date: 2014-07-19 12:37:46 +0200 (Sat, 19 Jul 2014) New Revision: 4045 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4045 Log: Ajout de doc. Retrait de code comment?\195?\169. Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -167,7 +167,13 @@ public void prepare() { weaver.prepareForWeave(); } - + + /** + * Cliper/coller de la classe originale {@code WeavingClassFileProvider} car elle n'est pas visible (private). + * + * L'appel à {@code delegateForCurrentClass.getResolvedTypeX().getName()} a été désactivé car c'est quelque chose + * qui est valorisé par l'instrospecteur d'aspect qui n'est pas défini pour IsisFish (aspect runtime). + */ private class WeavingClassFileProvider2 implements IClassFileProvider { private final UnwovenClassFile unwovenClass; Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2013 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -55,12 +55,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(CacheAspect.class); - //@Expression("execution(* scripts..*(..))") - //Pointcut scriptsMethod; - - public CacheAspect() { - } - /** * Return trace object from context. * @@ -85,7 +79,4 @@ } return result; } - } - - Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, Code Lutin + * Copyright (C) 1999 - 2014 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 @@ -40,9 +40,9 @@ import fr.ifremer.isisfish.types.TimeStep; /** - * Aspect utiliser pour intersepecter les appels a + * Aspect utilisé pour intersepecter les appels a * {@link Rule#init(SimulationContext)}, {@link Rule#preAction(SimulationContext, TimeStep, Metier)}, - * {@link Rule#postAction(SimulationContext, TimeStep, Metier)} et memoriser + * {@link Rule#postAction(SimulationContext, TimeStep, Metier)} et mémoriser * le temps mit. * * @author chatellier @@ -106,6 +106,7 @@ * @param jp join point * @param state state * @throws Throwable + * @return target joint point method result */ protected Object makeTimedCall(ProceedingJoinPoint jp, int state) throws Throwable { @@ -168,8 +169,7 @@ default: break; } - } - else { + } else { if (log.isWarnEnabled()) { log.warn("Time register called outside a simulation context"); } Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -36,7 +36,6 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import org.nuiton.profiling.Trace; -//import fr.ifremer.isisfish.util.Trace; /** * Permet de tracer les appels aux methodes utilisateur ainsi que l'execution @@ -55,16 +54,6 @@ @Aspect public class TraceAspect { - /*@Pointcut("execution(* scripts..*(..))" - + " || execution(* simulators..*(..))" - + " || execution(* rules..*(..)) " - + " || execution(* simulationplans..*(..)) " - + " || execution(* formules..*(..))") - Pointcut executeMethod;*/ - - public TraceAspect() { - } - /** * Return trace object from context. * Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2014-07-19 10:11:28 UTC (rev 4044) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2014-07-19 10:37:46 UTC (rev 4045) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2013 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 1999 - 2014 Ifremer, CodeLutin, 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 @@ -33,4 +33,3 @@ * </ul> */ package fr.ifremer.isisfish.aspect; -

1 0