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

r1609 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 20 Nov '08

20 Nov '08

Author: chatellier Date: 2008-11-20 14:26:29 +0000 (Thu, 20 Nov 2008) New Revision: 1609 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Update version Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-19 15:36:10 UTC (rev 1608) +++ isis-fish/trunk/pom.xml 2008-11-20 14:26:29 UTC (rev 1609) @@ -448,7 +448,7 @@   <name>IsisFish</name> - <version>3.2.0.2-SNAPSHOT</version> + <version>3.2.0.3-SNAPSHOT</version> <description>Simulateur de pecherie complexe.</description> <inceptionYear>1999</inceptionYear> @@ -471,7 +471,7 @@   - <current.version>3.2.0.2-SNAPSHOT</current.version> + <current.version>3.2.0.3-SNAPSHOT</current.version>  <jaxx.version>0.6</jaxx.version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-11-19 15:36:10 UTC (rev 1608) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-11-20 14:26:29 UTC (rev 1609) @@ -79,7 +79,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 1); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 3); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber(

1 0

r1608 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 15:36:10 +0000 (Wed, 19 Nov 2008) New Revision: 1608 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update i18n Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 15:33:40 UTC (rev 1607) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 15:36:10 UTC (rev 1608) @@ -1099,7 +1099,7 @@ isisfish.welcome.menu.frame=Frame isisfish.welcome.menu.help=Help isisfish.welcome.menu.input=Input -isisfish.welcome.menu.monitor=txtLogMonitor +isisfish.welcome.menu.monitor=Logs frame isisfish.welcome.menu.queue=Simulation queue isisfish.welcome.menu.result=Result isisfish.welcome.menu.script=Script Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 15:33:40 UTC (rev 1607) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 15:36:10 UTC (rev 1608) @@ -1099,7 +1099,7 @@ isisfish.welcome.menu.frame=Fen\u00EAtre isisfish.welcome.menu.help=Aide isisfish.welcome.menu.input=Saisie -isisfish.welcome.menu.monitor=txtLogMonitor +isisfish.welcome.menu.monitor=Fen\u00EAtre de logs isisfish.welcome.menu.queue=Liste des simulations isisfish.welcome.menu.result=R\u00E9sultat isisfish.welcome.menu.script=Script

1 0

r1607 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 15:33:40 +0000 (Wed, 19 Nov 2008) New Revision: 1607 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update i18n Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 15:32:57 UTC (rev 1606) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 15:33:40 UTC (rev 1607) @@ -1041,7 +1041,7 @@ isisfish.timeUnit.day=Day isisfish.timeUnit.hours=Hours isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s -isisfish.tray.simulation.no=Isis-fish - No simulation +isisfish.tray.simulation.no=Isis-fish - Pas de simulation isisfish.tripType.comments=Commentaires isisfish.tripType.duration=Dur\u00E9e isisfish.tripType.minTime=Temps minimal entre deux voyages

1 0

r1606 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 15:32:57 +0000 (Wed, 19 Nov 2008) New Revision: 1606 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update generated i18n Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 14:57:10 UTC (rev 1605) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 15:32:57 UTC (rev 1606) @@ -1040,7 +1040,7 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Day isisfish.timeUnit.hours=Hours -isisfish.tray.simulation=Isis-fish - %1$s : %2$s/%3$s +isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s isisfish.tray.simulation.no=Isis-fish - No simulation isisfish.tripType.comments=Comments isisfish.tripType.duration=Duration Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 14:57:10 UTC (rev 1605) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 15:32:57 UTC (rev 1606) @@ -1040,7 +1040,7 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Day isisfish.timeUnit.hours=Hours -isisfish.tray.simulation=Isis-fish - %1$s : %2$s/%3$s +isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s isisfish.tray.simulation.no=Isis-fish - No simulation isisfish.tripType.comments=Commentaires isisfish.tripType.duration=Dur\u00E9e

1 0

r1605 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 14:57:10 +0000 (Wed, 19 Nov 2008) New Revision: 1605 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java Log: Add subprocess launch Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-11-19 14:56:18 UTC (rev 1604) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-11-19 14:57:10 UTC (rev 1605) @@ -29,6 +29,7 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import fr.ifremer.isisfish.simulator.launcher.SubProcessSimulationLauncher; import fr.ifremer.isisfish.vcs.VCS; import java.io.File; import java.net.MalformedURLException; @@ -78,7 +79,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static VersionNumber version = new VersionNumber(3, 2, 0, 0); + protected final static VersionNumber version = new VersionNumber(3, 2, 0, 1); protected final static VersionNumber databaseVersion = new VersionNumber( version.getNumber(0), version.getNumber(1)); protected final static VersionNumber apiVersion = new VersionNumber( @@ -569,6 +570,7 @@ SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".localDefault", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".localSubDefault", _("isisfish.config.main.localSubSimulator.description"), SubProcessSimulationLauncher.class.getName()), SIMULATOR_SERVER("simulation.server", _("isisfish.config.main.simulationServer.description"), "http://simulateur.ifremer.fr:9090"), /** le login a utiliser pour les launcher distant, le type du launcher est ajouter a la cle (car 1 login par launcher) */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2008-11-19 14:56:18 UTC (rev 1604) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2008-11-19 14:57:10 UTC (rev 1605) @@ -92,7 +92,7 @@ @Override public String toString() { - return _("in Process"); + return _("isisfish.simulator.launcher.inprocess"); } protected void message(SimulationControl control, String message) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2008-11-19 14:56:18 UTC (rev 1604) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2008-11-19 14:57:10 UTC (rev 1605) @@ -19,6 +19,7 @@ package fr.ifremer.isisfish.simulator.launcher; +import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18nf._; import java.io.BufferedReader; @@ -52,7 +53,7 @@ @Override public String toString() { - return "Sub process"; + return _("isisfish.simulator.launcher.subprocess"); } @Override

1 0

r1604 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 14:56:18 +0000 (Wed, 19 Nov 2008) New Revision: 1604 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update sytray i18n Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 14:45:31 UTC (rev 1603) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 14:56:18 UTC (rev 1604) @@ -1040,8 +1040,8 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Day isisfish.timeUnit.hours=Hours -isisfish.tray.simulation=Isis-fish%1$s - %2$s/%3$s -isisfish.tray.simulation.no=Isis-fishNo simulation +isisfish.tray.simulation=Isis-fish - %1$s : %2$s/%3$s +isisfish.tray.simulation.no=Isis-fish - No simulation isisfish.tripType.comments=Comments isisfish.tripType.duration=Duration isisfish.tripType.minTime=Minimum time between trips Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 14:45:31 UTC (rev 1603) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 14:56:18 UTC (rev 1604) @@ -248,7 +248,7 @@ isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation isisfish.error.add.result.data=Erreur lors de l'ajout du r\u00E9sultat au data. isisfish.error.add.result.graph=Erreur lors de l'ajout du r\u00E9sultat au graph. -isisfish.error.add.tray=Can't add system tray icon +isisfish.error.add.tray=Impossible d'ajouter une icone de notification isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation isisfish.error.check.region=Can't check region @@ -684,7 +684,7 @@ isisfish.message.spacialized.visualisation=Spacialized visualisation isisfish.message.stop.with.error=stop with error %1$s isisfish.message.synchronize.done=synchronize termin\u00E9e. -isisfish.message.tray.disabled=SystemTray disabled +isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e isisfish.message.update.finished=update finished isisfish.metier.comments=Commentaires isisfish.metier.name=Nom @@ -1040,8 +1040,8 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Day isisfish.timeUnit.hours=Hours -isisfish.tray.simulation=Isis-fish%1$s - %2$s/%3$s -isisfish.tray.simulation.no=Isis-fishNo simulation +isisfish.tray.simulation=Isis-fish - %1$s : %2$s/%3$s +isisfish.tray.simulation.no=Isis-fish - No simulation isisfish.tripType.comments=Commentaires isisfish.tripType.duration=Dur\u00E9e isisfish.tripType.minTime=Temps minimal entre deux voyages

1 0

r1603 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 14:45:31 +0000 (Wed, 19 Nov 2008) New Revision: 1603 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update i18n translation Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 10:07:57 UTC (rev 1602) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-11-19 14:45:31 UTC (rev 1603) @@ -188,6 +188,7 @@ isisfish.config.main.javadocURL.description= isisfish.config.main.launchUI.description= isisfish.config.main.localSimulator.description= +isisfish.config.main.localSubSimulator.description= isisfish.config.main.locale.description=user locale isisfish.config.main.login.description= isisfish.config.main.password.description= @@ -743,7 +744,7 @@ isisfish.params.clearFilter=Clear filter isisfish.params.description=Description isisfish.params.filter=Filter -isisfish.params.lblLauncher= +isisfish.params.lblLauncher=Simulation launcher isisfish.params.loadOldSimulation=Load old simulation isisfish.params.numberYear=Number of year isisfish.params.onlyExportSimulation=Only export simulation @@ -1013,6 +1014,8 @@ isisfish.simulation.name=Simulation name isisfish.simulation.title=Simulation Launcher isisfish.simulationQueue.title=Simulation Queue +isisfish.simulator.launcher.inprocess=in current process +isisfish.simulator.launcher.subprocess=in subprocess isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age isisfish.species.cee=CEE Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 10:07:57 UTC (rev 1602) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-11-19 14:45:31 UTC (rev 1603) @@ -188,6 +188,7 @@ isisfish.config.main.javadocURL.description=l'url de la javadoc des scripts isisfish.config.main.launchUI.description= isisfish.config.main.localSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement +isisfish.config.main.localSubSimulator.description= isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.login.description=le login pour se connecter au serveur de simulations distant isisfish.config.main.password.description=le mot de passe pour se connecter au serveur de simulations distant @@ -743,7 +744,7 @@ isisfish.params.clearFilter=Reset filtre isisfish.params.description=Description isisfish.params.filter=Filtrer -isisfish.params.lblLauncher= +isisfish.params.lblLauncher=Lanceur de simulation isisfish.params.loadOldSimulation=Charger un ancienne simulation isisfish.params.numberYear=Nombre d'ann\u00E9es isisfish.params.onlyExportSimulation=Exporter uniquement des simulations @@ -1013,6 +1014,8 @@ isisfish.simulation.name=Nom de la simulation isisfish.simulation.title=Lanceur de simulations isisfish.simulationQueue.title=Queue des simulations +isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus +isisfish.simulator.launcher.subprocess=dans un sous processus isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=age isisfish.species.cee=CEE

1 0

r1602 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 10:07:57 +0000 (Wed, 19 Nov 2008) New Revision: 1602 Modified: isis-fish/trunk/changelog Log: Update changelog Modified: isis-fish/trunk/changelog =================================================================== --- isis-fish/trunk/changelog 2008-11-19 10:00:57 UTC (rev 1601) +++ isis-fish/trunk/changelog 2008-11-19 10:07:57 UTC (rev 1602) @@ -1,3 +1,13 @@ +isis-fish (3.2.0.x) xxx + + * switch to topia-service 1.0.0 + * switch to topia-persistence 2.1.0 + * remove tools.jar (now isis need JDK !!!) + +isis-fish (3.2.0.2) chatellier + + * fix missing lutinxml dependencies + isis-fish (3.2.0.1) chemit * all ui are now in src/main/java

1 0

r1601 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 10:00:57 +0000 (Wed, 19 Nov 2008) New Revision: 1601 Modified: isis-fish/trunk/pom.xml Log: Move isis to use topia-persistence module. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-19 09:26:58 UTC (rev 1600) +++ isis-fish/trunk/pom.xml 2008-11-19 10:00:57 UTC (rev 1601) @@ -43,8 +43,8 @@ </dependency> --> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> <scope>compile</scope> </dependency> @@ -52,7 +52,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia-service</artifactId> - <version>0.9.1</version> + <version>1.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -442,13 +442,6 @@ </dependency>  -  - </dependencies>  @@ -484,10 +477,10 @@ <jaxx.version>0.6</jaxx.version>  - <generator.version>0.61</generator.version> + <generator.version>0.62-SNAPSHOT</generator.version>  - <topia.version>2.0.29</topia.version> + <topia.version>2.1.0-SNAPSHOT</topia.version>  <lutinwidget.version>0.10</lutinwidget.version> @@ -571,10 +564,10 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> </dependencies> </plugin> @@ -598,25 +591,25 @@ <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> <version>${lutinwidget.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>jfreechart</groupId> <artifactId>jfreechart</artifactId> <version>0.9.3</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinmatrix</artifactId> <version>1.1</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> </dependencies> </plugin>

1 0

r1600 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 09:26:58 +0000 (Wed, 19 Nov 2008) New Revision: 1600 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Update pom, remove tools.jar Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-19 09:26:14 UTC (rev 1599) +++ isis-fish/trunk/pom.xml 2008-11-19 09:26:58 UTC (rev 1600) @@ -442,12 +442,12 @@ </dependency>  - <dependency> +  </dependencies> @@ -637,6 +637,7 @@ </configuration> <executions> <execution> + <phase>generate-resources</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> @@ -648,9 +649,18 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> </plugin> <plugin> @@ -677,20 +687,17 @@ <phase>package</phase> <configuration> <tasks> - <copy - file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" - todir="${project.basedir}/target/resources/jnlp/"> + <copy file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" + todir="${project.basedir}/target/resources/jnlp/"> <filterset> <filter token="mail" value="mail-1.4.jar"/> <filter token="activation" value="activation-1.1.jar"/> </filterset> </copy> - <copy - file="${project.build.directory}/lib/mail-1.4.jar" - todir="${project.basedir}/target/resources/jnlp/"/> - <copy - file="${project.build.directory}/lib/activation-1.1.jar" - todir="${project.basedir}/target/resources/jnlp/"/> + <copy file="${project.build.directory}/lib/mail-1.4.jar" + todir="${project.basedir}/target/resources/jnlp/"/> + <copy file="${project.build.directory}/lib/activation-1.1.jar" + todir="${project.basedir}/target/resources/jnlp/"/> </tasks> </configuration> <goals> @@ -769,8 +776,6 @@ </configuration> </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -790,7 +795,6 @@ </executions> </plugin> - </plugins> </build> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2008-11-19 09:26:14 UTC (rev 1599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2008-11-19 09:26:58 UTC (rev 1600) @@ -48,14 +48,13 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; -import com.sun.tools.javac.api.JavacTool; - import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.JavaSourceStorage; @@ -194,7 +193,9 @@ int result = -1000; try { - JavaCompiler compiler = JavacTool.create(); + //JavaCompiler compiler = JavacTool.create(); + // Use system compiler + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null); Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(src);

1 0