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

r3069 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 18 Jun '10

18 Jun '10

Author: chatellier Date: 2010-06-18 15:59:51 +0000 (Fri, 18 Jun 2010) New Revision: 3069 Log: Add usefull system info in debug.txt file. Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-06-18 15:58:55 UTC (rev 3068) +++ isis-fish/trunk/changelog.txt 2010-06-18 15:59:51 UTC (rev 3069) @@ -1,5 +1,6 @@ isis-fish (3.3.0.4) stable; urgency=low + * Add more startup information in debug.txt file (arch, R_HOME, PATH) * Add 64bits jri native libraries * Fix dependant simulation plans execution (beforeSimulation/afterSimulation) * Reduce spaces in strategies edition

1 0

r3068 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 18 Jun '10

18 Jun '10

Author: chatellier Date: 2010-06-18 15:58:55 +0000 (Fri, 18 Jun 2010) New Revision: 3068 Log: Add usefull system info in debug.txt file. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-06-18 15:07:30 UTC (rev 3067) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-06-18 15:58:55 UTC (rev 3068) @@ -312,11 +312,12 @@ // i18n is not inited here if (log.isInfoEnabled()) { log.info("Starting Isis-Fish with args : " + java.util.Arrays.toString(args)); - StringBuilder builder = new StringBuilder(); - builder.append(SimpleDateFormat.getInstance().format(new java.util.Date())); - builder.append(" Java version: ").append(System.getProperty("java.runtime.version")); - builder.append(" Isis-fish version: ").append(IsisConfig.getVersion()); - log.info(builder.toString()); + log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); + log.info("Java version: " + System.getProperty("java.runtime.version")); + log.info("Java VM: " + System.getProperty("java.vm.name")); + log.info("System arch: " + System.getProperty("os.arch")); + log.info("R_HOME: " + System.getenv("R_HOME")); + log.info("PATH: " + System.getenv("PATH")); } // first load converter and matrixFactory

1 0

r3067 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 18 Jun '10

18 Jun '10

Author: chatellier Date: 2010-06-18 15:07:30 +0000 (Fri, 18 Jun 2010) New Revision: 3067 Log: Add 64bits jri windows dll and linux so Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-06-18 15:06:35 UTC (rev 3066) +++ isis-fish/trunk/changelog.txt 2010-06-18 15:07:30 UTC (rev 3067) @@ -1,5 +1,6 @@ isis-fish (3.3.0.4) stable; urgency=low + * Add 64bits jri native libraries * Fix dependant simulation plans execution (beforeSimulation/afterSimulation) * Reduce spaces in strategies edition * Fix parameter edition for non primitive types in user script (Double...)

1 0

r3066 - in isis-fish/trunk/src/main/assembly: . x64
by chatellier＠users.labs.libre-entreprise.org 18 Jun '10

18 Jun '10

Author: chatellier Date: 2010-06-18 15:06:35 +0000 (Fri, 18 Jun 2010) New Revision: 3066 Log: Add 64bits jri windows dll and linux so Added: isis-fish/trunk/src/main/assembly/x64/ isis-fish/trunk/src/main/assembly/x64/jri.dll isis-fish/trunk/src/main/assembly/x64/libjri.so Modified: isis-fish/trunk/src/main/assembly/bin.xml Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2010-06-18 10:05:57 UTC (rev 3065) +++ isis-fish/trunk/src/main/assembly/bin.xml 2010-06-18 15:06:35 UTC (rev 3066) @@ -56,5 +56,13 @@ <source>src/main/assembly/x86/libjri.so</source> <outputDirectory>jri</outputDirectory> </file> + <file> + <source>src/main/assembly/x64/jri.dll</source> + <outputDirectory>jri64</outputDirectory> + </file> + <file> + <source>src/main/assembly/x64/libjri.so</source> + <outputDirectory>jri64</outputDirectory> + </file> </files> </assembly> \ No newline at end of file Added: isis-fish/trunk/src/main/assembly/x64/jri.dll =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x64/jri.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/assembly/x64/libjri.so =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x64/libjri.so ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream

1 0

r3065 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 18 Jun '10

18 Jun '10

Author: chatellier Date: 2010-06-18 10:05:57 +0000 (Fri, 18 Jun 2010) New Revision: 3065 Log: Modification de la condition d'arret pour les plans indepandants (un peu dure a lire quand meme :( ) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2010-06-17 12:15:54 UTC (rev 3064) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2010-06-18 10:05:57 UTC (rev 3065) @@ -229,10 +229,16 @@ SimulationControl subControl = subItem.getControl(); do { Thread.sleep(2000); + + // on boucle tant que: + // - la simulation n'a pas été arreté + // - la simulation n'est pas a 0 + // - la simulation n'est aps à la fin + // - la simulation n'existe pas localement } while (!subControl.isStopSimulationRequest() && - (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax()) - && !SimulationStorage.exists(subControl.getId())); - + (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax() + || !SimulationStorage.exists(subControl.getId()))); + // FIXME on fait manuellement le post simulation pour // plans dépendant if (!subControl.isStopSimulationRequest()) {

1 0

r3064 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: chatellier Date: 2010-06-17 12:15:54 +0000 (Thu, 17 Jun 2010) New Revision: 3064 Log: Update mavenpom Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-06-17 12:07:56 UTC (rev 3063) +++ isis-fish/trunk/pom.xml 2010-06-17 12:15:54 UTC (rev 3064) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.1.3</version> + <version>2.1.5</version> </parent> <groupId>ifremer</groupId>

1 0

r3063 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: chatellier Date: 2010-06-17 12:07:56 +0000 (Thu, 17 Jun 2010) New Revision: 3063 Log: org.apache.maven.plugins:maven-javadoc-plugin:maven-plugin:2.7.1 doesn't exists ! Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-06-17 12:04:36 UTC (rev 3062) +++ isis-fish/trunk/pom.xml 2010-06-17 12:07:56 UTC (rev 3063) @@ -448,7 +448,7 @@  <projectId>isis-fish</projectId> <labs.id>8</labs.id> - <javadoc.version>2.7.1</javadoc.version> + <javadoc.version>2.7</javadoc.version> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v2</license.licenseName>

1 0

r3062 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: chatellier Date: 2010-06-17 12:04:36 +0000 (Thu, 17 Jun 2010) New Revision: 3062 Log: Fix dependant simulation execution (before/after order). Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-06-17 12:02:34 UTC (rev 3061) +++ isis-fish/trunk/changelog.txt 2010-06-17 12:04:36 UTC (rev 3062) @@ -1,5 +1,7 @@ isis-fish (3.3.0.4) stable; urgency=low + * Fix dependant simulation plans execution (beforeSimulation/afterSimulation) + * Reduce spaces in strategies edition * Fix parameter edition for non primitive types in user script (Double...) * Add simulation parameter cache to not keep simulation prescript on memory Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2010-06-17 12:02:34 UTC (rev 3061) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2010-06-17 12:04:36 UTC (rev 3062) @@ -209,12 +209,16 @@ && param.getUseAnalysePlan() && !param.isIndependentPlan()) { // on est sur un plan d'analyse dependant, il faut generer les // simulation les unes apres les autres - Iterator<SimulationJob> i = new SimulationService.PrepareSimulationJob( + SimulationService.PrepareSimulationJob i = new SimulationService.PrepareSimulationJob( simulationService, this); while (!control.isStopSimulationRequest() && i.hasNext()) { log.info(_("Generate next simulation")); SimulationJob subjob = i.next(); subjob.setLauncher(getLauncher()); + // c'est bloquant seulement le temps du lancement + // (envoie sur caparmor par exemple) + // l'appel peut ensuite passer alors que la simulation + // n'a pas effectivement demarré subjob.run(); // FIXME temp fix les thread des launchers @@ -228,6 +232,13 @@ } while (!subControl.isStopSimulationRequest() && (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax()) && !SimulationStorage.exists(subControl.getId())); + + // FIXME on fait manuellement le post simulation pour + // plans dépendant + if (!subControl.isStopSimulationRequest()) { + SimulationStorage simulation = subjob.getLauncher().getSimulationStorage(simulationService, subControl); + i.finished(subjob, simulation); + } } } else { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2010-06-17 12:02:34 UTC (rev 3061) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2010-06-17 12:04:36 UTC (rev 3062) @@ -838,8 +838,7 @@ // appel de tous les plans pour modifier la simulation for (AnalysePlan plan : param.getAnalysePlans()) { result = result - && plan.beforeSimulation(planContext, - sim); + && plan.beforeSimulation(planContext, sim); if (!result) { nextJob = null; break; @@ -856,9 +855,14 @@ nextJob = new SimulationJob(simulationService, job, item, job.getPriority()); nextJob.setLauncher(job.getLauncher()); - nextJob.addPostAction(this); // pour l'appel des after des plans + + // FIXME on retire la post action pour les plan dépendants + // sera appelé directement par le job de preparations + if (param.isIndependentPlan()) { + nextJob.addPostAction(this); // pour l'appel des after des plans + } } - + // close context for plan generator sim.closeStorage();

1 0

r3061 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: chatellier Date: 2010-06-17 12:02:34 +0000 (Thu, 17 Jun 2010) New Revision: 3061 Log: Nommage du thread de monitoring Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-06-17 08:26:59 UTC (rev 3060) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-06-17 12:02:34 UTC (rev 3061) @@ -121,6 +121,9 @@ */ protected SimulationMonitor() { + // nomme le thread + super("monitor-thread"); + monitorFolder = IsisFish.config.getMonitoringDirectory(); // init monitor check map

1 0

r3060 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: chatellier Date: 2010-06-17 08:26:59 +0000 (Thu, 17 Jun 2010) New Revision: 3060 Log: Remove titleBorder to reduce stategies insets Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2010-06-16 14:19:31 UTC (rev 3059) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2010-06-17 08:26:59 UTC (rev 3060) @@ -51,66 +51,66 @@ <JPanel id='body' layout='{new BorderLayout()}'> <Table constraints='BorderLayout.CENTER'> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJanuary' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.january")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.january"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyFebuary' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.february")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.february"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMarch' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.march")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.march"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyApril' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.april")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.april"))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMay' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.may")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.may"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJune' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.june")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.june"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJuly' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.july")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.july"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyAugust' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.august")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.august"))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategySeptember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.september")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.september"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyOctober' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.october")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.october"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyNovember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.november")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.november"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyDecember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.december")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.december"))}' /> </cell> </row> </Table> <Table constraints='BorderLayout.SOUTH'> <row> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='1'> <JButton id='save' decorator='boxed'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='1'> <JButton id='cancel' decorator='boxed'/> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2010-06-16 14:19:31 UTC (rev 3059) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2010-06-17 08:26:59 UTC (rev 3060) @@ -20,6 +20,8 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> + <String id="strategieMonthText" javaBean='null'/> +  <fr.ifremer.isisfish.entities.StrategyImpl id='bean' javaBean='null'/> @@ -108,7 +110,7 @@ <Table id='body'> <row> <cell columns='2' fill='horizontal' weightx='1.0' anchor='west'> - <JLabel id='StrategieMonth' enabled='{isActif()}'/> + <JLabel enabled='{isActif()}' text="{getStrategieMonthText()}" font-weight="bold"/> </cell> </row> <row>

1 0