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

r1785 - in isis-fish/trunk: . doc src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/resources/ssh src/test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 04 Feb '09

04 Feb '09

Author: chatellier Date: 2009-02-04 10:31:47 +0000 (Wed, 04 Feb 2009) New Revision: 1785 Added: isis-fish/trunk/doc/SimulationSSH.rst isis-fish/trunk/src/main/resources/ssh/launch-isis-cron.seq isis-fish/trunk/src/main/resources/ssh/launch-isis-qsub.seq Removed: isis-fish/trunk/src/main/resources/ssh/launch-isis.seq Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: Ajout des cl?\195?\169s de configuration (qsub, remote tmp dir) Doc Added: isis-fish/trunk/doc/SimulationSSH.rst =================================================================== --- isis-fish/trunk/doc/SimulationSSH.rst (rev 0) +++ isis-fish/trunk/doc/SimulationSSH.rst 2009-02-04 10:31:47 UTC (rev 1785) @@ -0,0 +1,25 @@ +Configuration d'Isis +==================== + +Dans le fichier $HOME/.isis-config-3 + +Il faut configurer les paramètres : + + ssh.key.file=/home/username/.ssh/id_rsa + simulation.ssh.server=caparmor.ifremer.fr\:22 + simulation.ssh.username=username + simulation.ssh.datapath=/home/username/isis-database-3 + simulation.ssh.addscripttoqueuecommand=/usr/pbs/bin/qsub + simulation.ssh.isis.home=/home/chatellier/isis-fish-3.2.0.3 + simulation.ssh.tmppath=/tmp + simulation.ssh.control.check.interval=5 + +Le script qsub +============== + +Le script qsub est dans src/main/resources/ssh +(template freemarker). + +Il est uploadé et ajouté à qsub. + +(ie : qsub script) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-04 10:03:57 UTC (rev 1784) +++ isis-fish/trunk/pom.xml 2009-02-04 10:31:47 UTC (rev 1785) @@ -302,7 +302,7 @@ <dependency> <groupId>org.tmatesoft</groupId> <artifactId>svnkit</artifactId> - <version>1.2.1.5297</version> + <version>1.2.2.5405</version> <scope>compile</scope> </dependency>  Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-02-04 10:03:57 UTC (rev 1784) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-02-04 10:31:47 UTC (rev 1785) @@ -271,27 +271,61 @@ } /** - * Retourne le chemin complet du jar. + * Retourne le chemin relatif ou abs du repertoire + * root des données d'isis. * - * @return simulator jar path + * @return simulator data path */ - public String getSimulatorSshJarPath() { - String result = getOption(Option.SIMULATOR_SSH_JARPATH.key); + public String getSimulatorSshDataPath() { + String result = getOption(Option.SIMULATOR_SSH_DATAPATH.key); return result; } /** - * Retourne le chemin relatif ou abs du repertoire - * root des données d'isis. + * Retourne le chemin distant ou est installé isis. * - * @return simulator data path + * @return remote isis home */ - public String getSimulatorSshDataPath() { - String result = getOption(Option.SIMULATOR_SSH_DATAPATH.key); + public String getSimulatorSshIsisHome() { + String result = getOption(Option.SIMULATOR_SSH_ISIS_HOME.key); return result; } /** + * Retourne l'emplacement du dossier temporaire distant. + * + * Ce dossier doit être ABSOLUT. + * + * @return tmp dir + */ + public String getSimulatorSshTmpPath() { + String result = getOption(Option.SIMULATOR_SSH_TMPPATH.key); + return result; + } + + /** + * Retourne la commande a utiliser pour ajouter + * le script à la queue des simulation. + * + * @return add to queue command + */ + public String getSimulatorSshAddToQueueCommand() { + String result = getOption(Option.SIMULATOR_SSH_ADDSCRIPTTOQUEUECOMMAND.key); + return result; + } + + /** + * Retourne l'interval de temps a utiliser + * pour recuperer le fichier de control. + * + * @return time (in seconds) + */ + public long getSimulatorSshControlCheckInterval() { + int result = getOptionAsInt(Option.SIMULATOR_SSH_CONTROLCHECKINTERVAL.key); + return result; + } + + /** * Retourne la clé privée de l'utilisteur courant. * * @return private ssh key path @@ -646,8 +680,14 @@ SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.login.description"), "isisfish"), /** Serveur accessible par ssh : remote data path */ SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "/home/" + SIMULATOR_SSH_USER_NAME.defaultValue + "/isis-database-3"), - /** Serveur accessible par SSH : chemin complet du jar depuis le /home une fois connecté */ - SIMULATOR_SSH_JARPATH("simulation.ssh.jarpath", _("isisfish.config.main.simulation.ssh.jarpath.description"), "./isis-fish-" + getVersion() + "/isis-fish-" + getVersion() + ".jar"), + /** Serveur accessible par ssh : remote isis home install */ + SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home/" + SIMULATOR_SSH_USER_NAME.defaultValue + "/isis-fish"), + /** Serveur accessible par ssh : remote tmp path */ + SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", _("isisfish.config.main.simulation.ssh.tmppath.description"), "/tmp"), + /** Serveur accessible par SSH : chemin pour executer le script d'ajout des script dans la queue */ + SIMULATOR_SSH_ADDSCRIPTTOQUEUECOMMAND("simulation.ssh.addscripttoqueuecommand", _("isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description"), "/usr/pbs/bin/qsub"), + /** Serveur accessible par SSH : interval de check du fichier de control */ + SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "5"), LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), // REGION_MAP("regionMap", _("isisfish.config.main.regionMap.description"), "maps"), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-02-04 10:03:57 UTC (rev 1784) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-02-04 10:31:47 UTC (rev 1785) @@ -368,14 +368,23 @@ String localPath = simulationFile.getAbsolutePath(); - // Copy simulation file in same arch as local arch - // on windows, it's a bad idee :))) - // copy it always on caparmor remote temp dir ? - // /tmp ? - // TODO check it + // first check that remote directory exists + String remotePath = IsisFish.config.getSimulatorSshTmpPath(); + String command = "if [ ! -d \"" + remotePath +"\" ] ; then mkdir \"" + remotePath + "\"; fi"; + if(log.isInfoEnabled()) { + log.info("Creating remote temp directory (if not exists) " + remotePath); + if(log.isDebugEnabled()) { + log.debug("Executing command : " + command); + } + } + int exit = SSHUtils.exec(session, command); + + if(exit != 0) { + throw new SSHException(_("Command '%s' fail to execute", command)); + } + + // upload directory in that dir - String remotePath = "/tmp/"; - if (localPath.lastIndexOf("/") > 0) { remotePath += localPath.substring(localPath.lastIndexOf("/") + 1); } else if (localPath.lastIndexOf("\\") > 0) { // windows @@ -429,14 +438,10 @@ String localPath = simulationScript.getAbsolutePath(); - // Copy simulation file in same arch as local arch - // on windows, it's a bad idee :))) - // copy it always on caparmor remote temp dir ? - // /tmp ? - // TODO check it + String remotePath = IsisFish.config.getSimulatorSshTmpPath(); + // remote temp directory should have been created + // by #downloadResults(Session, String) - String remotePath = "/tmp/"; - if (localPath.lastIndexOf("/") > 0) { remotePath += localPath.substring(localPath.lastIndexOf("/") + 1); } else if (localPath.lastIndexOf("\\") > 0) { // windows @@ -468,7 +473,7 @@ File tempScript = File.createTempFile("launch-isis", ".seq"); tempScript.deleteOnExit(); // auto delete - String fileContent = getSimulationScriptLaunchContent("ssh/launch-isis.seq", simuationId, simulationZip); + String fileContent = getSimulationScriptLaunchContent("ssh/launch-isis-qsub.seq", simuationId, simulationZip); FileUtil.writeString(tempScript, fileContent); return tempScript; @@ -498,6 +503,7 @@ // context values Map<String, Object> root = new HashMap<String, Object>(); + root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); root.put("simulationid", simuationId); root.put("simulationzip", simulationZip); @@ -530,7 +536,7 @@ // command to : // - add script in qsub queue - String command = "qsub \"" + scriptRemotePath + "\""; + String command = IsisFish.config.getSimulatorSshAddToQueueCommand() + " \"" + scriptRemotePath + "\""; int exit = SSHUtils.exec(session, command); @@ -566,9 +572,6 @@ */ protected class RemoteSSHControlThread implements Runnable { - /** Sleep 1s */ - protected static final int SLEEPTIME = 1000; - /** Opened ssh session */ protected Session sshSession; @@ -593,12 +596,14 @@ @Override public void run() { + long sleepTime = IsisFish.config.getSimulatorSshControlCheckInterval() * 1000; + boolean running = true; while (running) { // wait try { - Thread.sleep(SLEEPTIME); + Thread.sleep(sleepTime); // log (to check if thread is still alive) if (log.isDebugEnabled()) { Added: isis-fish/trunk/src/main/resources/ssh/launch-isis-cron.seq =================================================================== --- isis-fish/trunk/src/main/resources/ssh/launch-isis-cron.seq (rev 0) +++ isis-fish/trunk/src/main/resources/ssh/launch-isis-cron.seq 2009-02-04 10:31:47 UTC (rev 1785) @@ -0,0 +1,7 @@ +#!/bin/bash + +cd "${isishome}" +#source /usr/share/modules/init/csh +#module load java/1.6.0 + +java -jar isis-fish-3.2.0.3.jar --option launch.ui false --simulateWithSimulation "${simulationid}" "${simulationzip}" Copied: isis-fish/trunk/src/main/resources/ssh/launch-isis-qsub.seq (from rev 1773, isis-fish/trunk/src/main/resources/ssh/launch-isis.seq) =================================================================== --- isis-fish/trunk/src/main/resources/ssh/launch-isis-qsub.seq (rev 0) +++ isis-fish/trunk/src/main/resources/ssh/launch-isis-qsub.seq 2009-02-04 10:31:47 UTC (rev 1785) @@ -0,0 +1,9 @@ +#!/bin/csh + +#PBS -l mem=1000mb + +cd "${isishome}" +source /usr/share/modules/init/csh +module load java/1.6.0 + +java -jar isis-fish.jar --option launch.ui false --simulateWithSimulation "${simulationid}" "${simulationzip}" Property changes on: isis-fish/trunk/src/main/resources/ssh/launch-isis-qsub.seq ___________________________________________________________________ Name: svn:mergeinfo + Deleted: isis-fish/trunk/src/main/resources/ssh/launch-isis.seq =================================================================== --- isis-fish/trunk/src/main/resources/ssh/launch-isis.seq 2009-02-04 10:03:57 UTC (rev 1784) +++ isis-fish/trunk/src/main/resources/ssh/launch-isis.seq 2009-02-04 10:31:47 UTC (rev 1785) @@ -1,9 +0,0 @@ -#!/bin/csh - -#PBS -l mem=1000mb - -cd /export/home3/smahevas/isis-fish -source /usr/share/modules/init/csh -module load java/1.6.0 - -java -jar isis-fish-3.2.0.3/isis-fish.jar --option launch.ui false --simulateWithSimulation "${simulationid}" "${simulationzip}" Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-02-04 10:03:57 UTC (rev 1784) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-02-04 10:31:47 UTC (rev 1785) @@ -24,6 +24,7 @@ import org.junit.Test; +import fr.ifremer.isisfish.IsisFish; import freemarker.template.TemplateException; /** @@ -50,17 +51,22 @@ @Test public void testFreemarkerTemplate() throws IOException, TemplateException { - final String TEMPLATE = "ssh/launch-isis.seq"; + final String TEMPLATE = "ssh/launch-isis-qsub.seq"; final String SIMULATIONID = "testid"; final String SIMULATIONZIP = "test.zip"; - + final String ISISHOME = IsisFish.config.getSimulatorSshIsisHome(); + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); String content = launcher.getSimulationScriptLaunchContent(TEMPLATE, SIMULATIONID, SIMULATIONZIP); + // simulation parameters Assert.assertTrue("String \"" + SIMULATIONID + "\" not found in template", content.indexOf(SIMULATIONID) > 0); - Assert.assertTrue("String \"" + SIMULATIONZIP + "\" not found in template", content.indexOf(SIMULATIONZIP) > 0); + + // isis location + Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", + content.indexOf(ISISHOME) > 0); } } \ No newline at end of file

1 0

r1784 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 04 Feb '09

04 Feb '09

Author: chatellier Date: 2009-02-04 10:03:57 +0000 (Wed, 04 Feb 2009) New Revision: 1784 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Log: Re ajout d'une methode d?\195?\169pr?\195?\169ci?\195?\169e qui est en fait toujours utilis?\195?\169e dans les scripts Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-02-04 00:32:33 UTC (rev 1783) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-02-04 10:03:57 UTC (rev 1784) @@ -499,7 +499,7 @@ * Retourne la {@link FisheryRegion} associee a cette simulation * @param context * @return - * @throws fr.ifremer.isisfish.datastore.StorageException + * @throws StorageException */ static public FisheryRegion getFisheryRegion(TopiaContext context) throws StorageException { @@ -521,6 +521,29 @@ } /** + * Retourne la {@link FisheryRegion} associee a cette simulation. + * + * Attention, toujours utilisée dans les scripts !!! + * + * @return la {@link FisheryRegion} + * @throws StorageException + * @deprecated ne plus utiliser car le context n'est jamais ferme, plutot + * utiliser {@link #getFisheryRegion(TopiaContext)} + */ + public FisheryRegion getFisheryRegion() throws StorageException { + // FIXME voir si la methode est vraiment utilisée car le context n'est + // jamais fermé, ce qui est dérangeant + try { + TopiaContext tx = getStorage().beginTransaction(); + FisheryRegion result = getFisheryRegion(tx); + tx.commitTransaction(); + return result; + } catch (TopiaException eee) { + throw new StorageException(_("isisfish.error.get.fisheryRegion"), eee); + } + } + + /** * Checkout not existing Simulation localy from server * * @param name name of simulation to retrieve

1 0

r1783 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 04 Feb '09

04 Feb '09

Author: tchemit Date: 2009-02-04 00:32:33 +0000 (Wed, 04 Feb 2009) New Revision: 1783 Modified: isis-fish/trunk/pom.xml Log: - nettoayge pom - utilisation nouveau patch pour le plugin webstart (on peut tester localement le jnlp via la variable jnlpCodebase). (par contre probleme de chargement de region, le fameux NPE dans la migration : encore un probleme de lutinutil Resource je pense...) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-03 22:29:34 UTC (rev 1782) +++ isis-fish/trunk/pom.xml 2009-02-04 00:32:33 UTC (rev 1783) @@ -349,7 +349,7 @@ <topia.version>2.1.3-SNAPSHOT</topia.version> <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> - <lutinwidget.version>0.12</lutinwidget.version> + <lutinwidget.version>0.12</lutinwidget.version> <generator.version>0.64-SNAPSHOT</generator.version> <openmap.version>4.6.4</openmap.version> @@ -361,6 +361,10 @@ <keystorealias>CodeLutin</keystorealias> <keystorepass>codelutin</keystorepass> <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> + +  +  + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> </properties> <build> @@ -433,33 +437,6 @@ </configuration> </execution> </executions> -  </plugin> <plugin> @@ -524,7 +501,6 @@ <executions> <execution> <id>copy-dependencies</id> -  </execution> </executions> <configuration> @@ -538,7 +514,6 @@ <archive> <manifest> <addClasspath>true</addClasspath> -  <classpathPrefix>./lib/</classpathPrefix> </manifest> </archive> @@ -546,16 +521,7 @@ </plugin> </plugins> -  + </build>  @@ -615,7 +581,7 @@ <filter token="lib-javahelp" value="javahelp-2.0.02.jar"/> <filter token="lib-activation" value="activation-1.1.jar"/> <filter token="lib-mail" value="mail-1.4.jar"/> - <filter token="url" value="${project.url}"/> + <filter token="url" value="${jnlpCodebase}"/> </filterset> </copy> <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" @@ -623,7 +589,7 @@ todir="${jnlp.build.directory}" failonerror="false"> <filterset> <filter token="lib" value="jxlayer-3.0.1.jar"/> - <filter token="url" value="${project.url}"/> + <filter token="url" value="${jnlpCodebase}"/> </filterset> </copy> @@ -649,13 +615,13 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.site.gen.dir}/resources"/> + <mkdir dir="${maven.site.gen.dir}/resources"/> <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false"> <fileset dir="${jnlp.build.directory}"> <include name="**"/> </fileset> -  +  <fileset dir="target"> <include name="${project.build.finalName}-bin.zip"/> </fileset> @@ -672,7 +638,7 @@ <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20081018</version> + <version>1.0-alpha-2-cl_20090204</version> <executions> <execution> <phase>verify</phase> @@ -728,49 +694,6 @@ </configuration> </plugin> - -  -  -  -  - <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-3</version> @@ -789,62 +712,6 @@ </executions> </plugin> -  -  -  -  -  - </plugins> </build> </profile>

1 0

r1782 - in isis-fish/trunk: . src/main src/main/jnlp src/main/resources/jnlp
by tchemit＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: tchemit Date: 2009-02-03 22:29:34 +0000 (Tue, 03 Feb 2009) New Revision: 1782 Added: isis-fish/trunk/src/main/jnlp/ isis-fish/trunk/src/main/jnlp/jxlayer.jnlp isis-fish/trunk/src/main/jnlp/sun.jnlp Removed: isis-fish/trunk/src/main/resources/jnlp/sun.jnlp Modified: isis-fish/trunk/pom.xml Log: preparation release lutinproject 3.4 reusinage de webstart Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-03 16:44:23 UTC (rev 1781) +++ isis-fish/trunk/pom.xml 2009-02-03 22:29:34 UTC (rev 1782) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>ifremer</groupId> @@ -26,7 +26,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>${lutinutil.version}</version> <scope>compile</scope> </dependency> @@ -152,7 +152,7 @@ <version>3.1</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-server</artifactId> @@ -166,7 +166,7 @@ <version>3.1</version> <scope>runtime</scope> </dependency> - +  <dependency> <groupId>org.beanshell</groupId> @@ -341,21 +341,26 @@  <labs.project>isis-fish</labs.project> + <maven.test.forkMode>once</maven.test.forkMode> +  <jaxx.version>1.1-SNAPSHOT</jaxx.version> <generator.version>0.63</generator.version> - <topia.version>2.1.1</topia.version> - <lutinwidget.version>0.12</lutinwidget.version> + <topia.version>2.1.3-SNAPSHOT</topia.version> <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> + <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> + <lutinwidget.version>0.12</lutinwidget.version> + <generator.version>0.64-SNAPSHOT</generator.version> <openmap.version>4.6.4</openmap.version>  <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class>  - <keystorepath>../../../CodeLutinKeystore</keystorepath> + <keystorepath>${codelutin.keystorepath}</keystorepath> <keystorealias>CodeLutin</keystorealias> <keystorepass>codelutin</keystorepass> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> </properties> <build> @@ -363,11 +368,11 @@  <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + </configuration> </plugin> <plugin> @@ -460,7 +465,17 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <encoding>${maven.compile.encoding}</encoding> + <src>${maven.src.dir}/main/resources/i18n</src> + <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> + <keysModifier>false</keysModifier> + <keepBackup>false</keepBackup> <entries> <entry> <basedir>${maven.gen.dir}/java/</basedir> @@ -482,11 +497,34 @@ </executions> </plugin> +  <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <id>copy-dependencies</id> +  </execution> </executions> <configuration> @@ -500,7 +538,7 @@ <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>${maven.jar.main.class}</mainClass> +  <classpathPrefix>./lib/</classpathPrefix> </manifest> </archive> @@ -508,6 +546,16 @@ </plugin> </plugins> +  </build>  @@ -531,34 +579,183 @@ <build> <plugins> +  <plugin> -  + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions>  <execution> <id>JnlpSun</id> - <phase>package</phase> + <phase>verify</phase> <configuration> <tasks> - <copy file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" - todir="${project.basedir}/target/resources/jnlp/"> + <mkdir dir="${jnlp.build.directory}"/> + <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" + verbose="${maven.verbose}" + todir="${jnlp.build.directory}" failonerror="false"> <filterset> - <filter token="mail" value="mail-1.4.jar"/> - <filter token="activation" value="activation-1.1.jar"/> + <filter token="lib-javahelp" value="javahelp-2.0.02.jar"/> + <filter token="lib-activation" value="activation-1.1.jar"/> + <filter token="lib-mail" value="mail-1.4.jar"/> + <filter token="url" value="${project.url}"/> </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.basedir}/src/main/jnlp/jxlayer.jnlp" + verbose="${maven.verbose}" + todir="${jnlp.build.directory}" failonerror="false"> + <filterset> + <filter token="lib" value="jxlayer-3.0.1.jar"/> + <filter token="url" value="${project.url}"/> + </filterset> + </copy> + + <copy verbose="${maven.verbose}" + todir="${jnlp.build.directory}/lib" + failonerror="false"> + <fileset dir="${project.build.directory}/lib"> + <include name="javahelp-2.0.02.jar"/> + <include name="activation-1.1.jar"/> + <include name="mail-1.4.jar"/> + <include name="jxlayer-3.0.1.jar"/> + </fileset> + </copy> </tasks> </configuration> <goals> <goal>run</goal> </goals> </execution> -  + <fileset dir="target"> + <include name="${project.build.finalName}-bin.zip"/> + </fileset> + + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20081018</version> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + <configuration> + <force>false</force> + <dependencies> + <excludes> + <exclude>javax.help:javahelp</exclude> + <exclude>javax.mail:mail</exclude> + <exclude>javax.activation:activation</exclude> + <exclude>org.swinglabs:jxlayer</exclude> + </excludes> + </dependencies> + <libPath>lib</libPath> + <extensions> + <sun>sun.jnlp</sun> + <jxlayer>jxlayer.jnlp</jxlayer> + </extensions> + <jnlp> + <outputFile>isis-fish-v3.jnlp</outputFile> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + + <sign> + <keystore>${keystorepath}</keystore> + <keypass/> + <storepass>${keystorepass}</storepass> + <storetype/> + <alias>${keystorealias}</alias> + <validity/> + <dnameCn/> + <dnameOu/> + <dnameO/> + <dnameL/> + <dnameSt/> + <dnameC/> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + <pack200>false</pack200> + <gzip>true</gzip> + <verbose>false</verbose> + </configuration> + </plugin> + + +  +  +  +  + </execution> </executions> - </plugin> + </plugin--> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -594,7 +791,7 @@   - <plugin> +  - <outputFile>isis-fish-v3.jnlp</outputFile> + <jnlp--> +  +  </plugins> </build> Added: isis-fish/trunk/src/main/jnlp/jxlayer.jnlp =================================================================== --- isis-fish/trunk/src/main/jnlp/jxlayer.jnlp (rev 0) +++ isis-fish/trunk/src/main/jnlp/jxlayer.jnlp 2009-02-03 22:29:34 UTC (rev 1782) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="@url@" href="jxlayer.jnlp"> + <information> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <offline-allowed/> + </information> + <resources> + <jar href="lib/@lib@"/> + </resources> + <component-desc/> +</jnlp> \ No newline at end of file Copied: isis-fish/trunk/src/main/jnlp/sun.jnlp (from rev 1781, isis-fish/trunk/src/main/resources/jnlp/sun.jnlp) =================================================================== --- isis-fish/trunk/src/main/jnlp/sun.jnlp (rev 0) +++ isis-fish/trunk/src/main/jnlp/sun.jnlp 2009-02-03 22:29:34 UTC (rev 1782) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="@url@" href="sun.jnlp"> + <information> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <offline-allowed/> + </information> + <resources> + <jar href="lib/@lib-mail@"/> + <jar href="lib/@lib-activation@"/> + <jar href="lib/@lib-javahelp@"/> + </resources> + <component-desc/> +</jnlp> \ No newline at end of file Property changes on: isis-fish/trunk/src/main/jnlp/sun.jnlp ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/resources/jnlp/sun.jnlp =================================================================== --- isis-fish/trunk/src/main/resources/jnlp/sun.jnlp 2009-02-03 16:44:23 UTC (rev 1781) +++ isis-fish/trunk/src/main/resources/jnlp/sun.jnlp 2009-02-03 22:29:34 UTC (rev 1782) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jnlp spec="1.0+" codebase="http://isis-fish.labs.libre-entreprise.org/jnlp" href="sun.jnlp"> - <information> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <offline-allowed /> - </information> - <resources> - -<jar href="@mail@"/> -<jar href="@activation@"/> - - </resources> - <component-desc/> -</jnlp> \ No newline at end of file

1 0

r1781 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 16:44:23 +0000 (Tue, 03 Feb 2009) New Revision: 1781 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java Log: Cette fois c'est la bonne ;) Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-02-03 16:38:30 UTC (rev 1780) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-02-03 16:44:23 UTC (rev 1781) @@ -103,37 +103,38 @@ final MatrixPanelEditor panel = new MatrixPanelEditor(false, 800, 300); panel.setMatrix(mat); - final JDialog dialog = new JDialog(); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - try { - JOptionPane.showMessageDialog(dialog, panel,_("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); - } catch (HeadlessException he) { - if(log.isErrorEnabled()) { - log.error("No X11 display available", he); + try { + final JDialog dialog = new JDialog(); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + + JOptionPane.showMessageDialog(dialog, panel,_("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); + + } + }); + + Thread t = new Thread(new Runnable() { + public void run() { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // do nothing } + dialog.dispose(); } + }); + t.start(); + + // it would really be nice to wait the thread, otherwise the test + // means nothing!!! + t.join(); + } catch (HeadlessException he) { + if(log.isErrorEnabled()) { + log.error("No X11 display available", he); } - }); - Thread t = new Thread(new Runnable() { - public void run() { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - // do nothing - } - dialog.dispose(); - } - }); - t.start(); + } - // it would really be nice to wait the thread, otherwise the test - // means nothing!!! - t.join(); - - - System.out.println("end"); } @@ -180,35 +181,37 @@ box.add(panel); box.add(bigpanel); - final JDialog dialog = new JDialog(); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - try { - JOptionPane.showMessageDialog(dialog, box, _("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); - } catch (HeadlessException he) { - if(log.isErrorEnabled()) { - log.error("No X11 display available", he); + try { + final JDialog dialog = new JDialog(); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + + JOptionPane.showMessageDialog(dialog, box, _("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); + + } + }); + + Thread t = new Thread(new Runnable() { + public void run() { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // do nothing } + dialog.dispose(); } + }); + t.start(); + + // it would really be nice to wait the thread, otherwise the test + // means nothing!!! + t.join(); + } catch (HeadlessException he) { + if(log.isErrorEnabled()) { + log.error("No X11 display available", he); } - }); - - Thread t = new Thread(new Runnable() { - public void run() { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - // do nothing - } - dialog.dispose(); - } - }); - t.start(); - - // it would really be nice to wait the thread, otherwise the test - // means nothing!!! - t.join(); + } System.out.println("end"); }

1 0

r1780 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 16:38:30 +0000 (Tue, 03 Feb 2009) New Revision: 1780 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java Log: Ajout d'un catch sur HeadlessException dans le cas ou les test ne passent pas s'il n'y a pas de X11 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-02-03 16:14:50 UTC (rev 1779) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2009-02-03 16:38:30 UTC (rev 1780) @@ -17,46 +17,47 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * PopulationSeasonInfoTest.java - * - * Created: 29 juin 2006 20:19:32 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ + package fr.ifremer.isisfish.entity; import static org.codelutin.i18n.I18n._; +import java.awt.HeadlessException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.awt.event.WindowEvent; import javax.swing.Box; +import javax.swing.JDialog; import javax.swing.JOptionPane; -import javax.swing.JDialog; import javax.swing.SwingUtilities; -import junit.framework.TestCase; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.math.matrix.MatrixIterator; import org.codelutin.math.matrix.MatrixND; import org.codelutin.math.matrix.gui.MatrixPanelEditor; +import org.junit.Test; - /** + * PopulationSeasonInfoTest. + * + * Created: 29 juin 2006 20:19:32 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - -public class PopulationSeasonInfoTest extends TestCase { +public class PopulationSeasonInfoTest{ + + /** Logger for this class */ + private static final Log log = LogFactory.getLog(PopulationSeasonInfoTest.class); + + @Test public void testToString() { String [] s = new String[]{"toto", "titi", "tutu"}; System.out.println(Arrays.toString(s)); @@ -65,6 +66,7 @@ /* * Test method for 'fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl.getGroupChangeMatrix(Month)' */ + @Test public void testGetGroupChangeMatrix() throws InterruptedException { System.out.println("begin"); int nbrAge = 3; @@ -105,8 +107,13 @@ SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - JOptionPane.showMessageDialog(dialog, panel,_("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); - + try { + JOptionPane.showMessageDialog(dialog, panel,_("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); + } catch (HeadlessException he) { + if(log.isErrorEnabled()) { + log.error("No X11 display available", he); + } + } } }); Thread t = new Thread(new Runnable() { @@ -133,6 +140,7 @@ /** * Converte no spacialized matrix to spacialized matrix */ + @Test public void testSpacializeLengthChangeMatrix() throws InterruptedException { @@ -176,7 +184,13 @@ SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - JOptionPane.showMessageDialog(dialog, box, _("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); + try { + JOptionPane.showMessageDialog(dialog, box, _("Spacialized visualisation"), JOptionPane.INFORMATION_MESSAGE); + } catch (HeadlessException he) { + if(log.isErrorEnabled()) { + log.error("No X11 display available", he); + } + } } });

1 0

r1779 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 16:14:50 +0000 (Tue, 03 Feb 2009) New Revision: 1779 Modified: isis-fish/trunk/pom.xml Log: Utilisation de la modif de lutinutil pour que la recherche dans le classpath fonctionne Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-03 16:04:35 UTC (rev 1778) +++ isis-fish/trunk/pom.xml 2009-02-03 16:14:50 UTC (rev 1779) @@ -26,7 +26,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <scope>compile</scope> </dependency>

1 0

r1778 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/test/java/fr/ifremer src/test/java/fr/ifremer/isisfish src/test/java/fr/ifremer/isisfish/simulator src/test/resources src/test/resources/simulations
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 16:04:35 +0000 (Tue, 03 Feb 2009) New Revision: 1778 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java isis-fish/trunk/src/test/resources/simulations/ isis-fish/trunk/src/test/resources/simulations/test-nonregression-20090203.zip Removed: isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationTest.zip Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java Log: Fix test, modify surefire plugin configuration to make test to work ! Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-03 13:54:41 UTC (rev 1777) +++ isis-fish/trunk/pom.xml 2009-02-03 16:04:35 UTC (rev 1778) @@ -352,9 +352,6 @@  <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> -  <keystorepath>../../../CodeLutinKeystore</keystorepath> <keystorealias>CodeLutin</keystorealias> @@ -364,7 +361,16 @@ <build> <plugins> +  <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + </configuration> + </plugin> + + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-03 13:54:41 UTC (rev 1777) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-03 16:04:35 UTC (rev 1778) @@ -283,11 +283,14 @@ * @throws VCSException */ static public void initVCS() throws VCSException { + + // init vcs + // even if UI in not launched + vcs = VCSFactory.createVCS(config); + if (config.isLaunchUI()) { // FIXME ajouter une option vcs.init - // init vcs - vcs = VCSFactory.createVCS(config); VCSActionAsker asker = new VCSActionAsker(); vcs.addVetoableActionListener(asker); Deleted: isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java 2009-02-03 13:54:41 UTC (rev 1777) +++ isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java 2009-02-03 16:04:35 UTC (rev 1778) @@ -1,806 +0,0 @@ -/* *##% -* Copyright (C) 2002, 2003 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 published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*##%*/ - -/* * -* Persistence.java -* -* Created: 3 août 2004 -* -* @author Benjamin Poussin <poussin at codelutin.com> -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - -package fr.ifremer; - -import fr.ifremer.isisfish.IsisFishDAOHelper; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.entities.*; - -import junit.framework.TestCase; - -import org.codelutin.topia.TopiaContext; -import org.codelutin.util.FileUtil; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.File; -import java.util.Collection; - -public class PersistenceTest extends TestCase { - - /** - * Logger for this class - */ - private static final Log log = LogFactory.getLog(PersistenceTest.class); - // Persistence - TopiaContext context = null; - RegionStorage rs; - -// protected Properties getDerbyProperties() { -// Properties config = new Properties(); -// -// config = IsisConfig.addDatabaseConfig(config, new File("/tmp/topiaderbytest")); -// config = IsisConfig.addHibernateMapping(config); -// -// return config; -// } -// -// protected Properties getProperties() { -// return getDerbyProperties(); -// } - - public void setUp() throws Exception { - File dir = FileUtil.createTempDirectory("isisdbtest", ""); - System.setProperty("localDatabase",dir.getAbsolutePath()); - IsisFish.init(); - - rs = RegionStorage.create("test"); - context = rs.getStorage(); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ - @Override - protected void tearDown() throws Exception { - rs.delete(false); - } - - public void testInstanciate() throws Exception { - TopiaContext context = this.context.beginTransaction(); - -// { -// AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context); -// AgeGroup o = ps.create(); -// log.debug(o + " - " +o.getClass().getName()); -// } - { - FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context); - FisheryRegion o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } -// { -// CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context); -// CompositeZone o = ps.create(); -// } - { - EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context); - EffortDescription o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } -// { -// EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context); -// Emigration o = ps.create(); -// log.debug(o + " - " +o.getClass().getName()); -// } -// { -// EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context); -// Equation o = ps.create(); -// } - { - GearDAO ps = IsisFishDAOHelper.getGearDAO(context); - Gear o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } -// { -// ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context); -// Immigration o = ps.create(); -// log.debug(o + " - " +o.getClass().getName()); -// } -// { -// LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context); -// LengthGroup o = ps.create(); -// log.debug(o + " - " +o.getClass().getName()); -// } -// { -// MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context); -// MappingZoneReproZoneRecru o = ps.create(); -// log.debug(o + " - " +o.getClass().getName()); -// } - { - CellDAO ps = IsisFishDAOHelper.getCellDAO(context); - Cell o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context); - Species o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context); - Metier o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); - MetierSeasonInfo o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } -// { -// MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context); -// Migration o = ps.create(); -// log.debug(o + " - " +o.getClass().getName()); -// } - { -// try{ - PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context); - PopulationGroup o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); -// assertTrue(false); // normalement on a pas le droit d'instancier une entity abstraite -// }catch(TopiaException eee){ -// assertTrue(true); -// } - } - { - PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context); - Population o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - PortDAO ps = IsisFishDAOHelper.getPortDAO(context); - Port o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - ResultDAO ps = IsisFishDAOHelper.getResultDAO(context); - Result o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - SeasonDAO ps = IsisFishDAOHelper.getSeasonDAO(context); - Season o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); - PopulationSeasonInfo o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context); - Selectivity o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context); - SetOfVessels o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } -// { -// SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context); -// SimpleZone o = ps.create(); -// } - { - StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); - StrategyMonthInfo o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context); - Strategy o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context); - TargetSpecies o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context); - TripType o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context); - VesselType o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - { - ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context); - Zone o = ps.create(); - log.debug(o + " - " +o.getClass().getName()); - } - - context.rollbackTransaction(); - } - - - public void testMakePersistence() throws Exception { - TopiaContext context = this.context.beginTransaction(); -// { -// AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context); -// AgeGroup o = ps.create(); -// o = ps.update(o); -// } - { - FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context); - FisheryRegion o = ps.create(); - o = ps.update(o); - } -// { -// CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context); -// CompositeZone o = ps.create(); -// o = ps.update(o); -// } - { - EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context); - EffortDescription o = ps.create(); - o = ps.update(o); - } -// { -// EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context); -// Emigration o = ps.create(); -// o = ps.update(o); -// } -// { -// EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context); -// Equation o = ps.create(); -// o = ps.update(o); -// } - { - GearDAO ps = IsisFishDAOHelper.getGearDAO(context); - Gear o = ps.create(); - o = ps.update(o); - } -// { -// ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context); -// Immigration o = ps.create(); -// o = ps.update(o); -// } -// { -// LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context); -// LengthGroup o = ps.create(); -// o = ps.update(o); -// } -// { -// MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context); -// MappingZoneReproZoneRecru o = ps.create(); -// o = ps.update(o); -// } - { - CellDAO ps = IsisFishDAOHelper.getCellDAO(context); - Cell o = ps.create(); - o = ps.update(o); - } - { - SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context); - Species o = ps.create(); - o = ps.update(o); - } - { - MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context); - Metier o = ps.create(); - o = ps.update(o); - } - { - MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); - MetierSeasonInfo o = ps.create(); - o = ps.update(o); - } -// { -// MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context); -// Migration o = ps.create(); -// o = ps.update(o); -// } - { -// try{ - PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context); - PopulationGroup o = ps.create(); - o = ps.update(o); -// assertTrue(false); // normalement on a pas le droit d'instancier une entity abstraite -// }catch(TopiaException eee){ -// assertTrue(true); -// } - } - { - PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context); - Population o = ps.create(); - o = ps.update(o); - } - { - PortDAO ps = IsisFishDAOHelper.getPortDAO(context); - Port o = ps.create(); - o = ps.update(o); - } - { - ResultDAO ps = IsisFishDAOHelper.getResultDAO(context); - Result o = ps.create(); - o = ps.update(o); - } - { - PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); - PopulationSeasonInfo o = ps.create(); - o = ps.update(o); - } - { - SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context); - Selectivity o = ps.create(); - o = ps.update(o); - } - { - SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context); - SetOfVessels o = ps.create(); - o = ps.update(o); - } -// { -// SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context); -// SimpleZone o = ps.create(); -// o = ps.update(o); -// } - { - StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); - StrategyMonthInfo o = ps.create(); - o = ps.update(o); - } - { - StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context); - Strategy o = ps.create(); - o = ps.update(o); - } - { - TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context); - TargetSpecies o = ps.create(); - o = ps.update(o); - } - { - TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context); - TripType o = ps.create(); - o = ps.update(o); - } - { - VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context); - VesselType o = ps.create(); - o = ps.update(o); - } - { - ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context); - Zone o = ps.create(); - o = ps.update(o); - } - context.rollbackTransaction(); - } - - public void testFindAll() throws Exception { - TopiaContext context = this.context.beginTransaction(); -// { -// AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context); -// Collection<AgeGroup> list = ps.findAll(); -// log.debug(list + " - " +ps.getClass().getName()); -// } - { - FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context); - Collection<FisheryRegion> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } -// { -// CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context); -// Collection list<CompositeZone> = ps.findAll(); -// } - { - EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context); - Collection<EffortDescription> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } -// { -// EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context); -// Collection<Emigration> list = ps.findAll(); -// log.debug(list + " - " +ps.getClass().getName()); -// } - { - GearDAO ps = IsisFishDAOHelper.getGearDAO(context); - Collection<Gear> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } -// { -// ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context); -// Collection<Immigration> list = ps.findAll(); -// log.debug(list + " - " +ps.getClass().getName()); -// } -// { -// LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context); -// Collection<LengthGroup> list = ps.findAll(); -// log.debug(list + " - " +ps.getClass().getName()); -// } -// { -// MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context); -// Collection<MappingZoneReproZoneRecru> list = ps.findAll(); -// log.debug(list + " - " +ps.getClass().getName()); -// } - { - CellDAO ps = IsisFishDAOHelper.getCellDAO(context); - Collection<Cell> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context); - Collection<Species> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context); - Collection<Metier> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); - Collection<MetierSeasonInfo> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } -// { -// MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context); -// Collection<Migration> list = ps.findAll(); -// log.debug(list + " - " +ps.getClass().getName()); -// } - { - PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context); - Collection<PopulationGroup> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context); - Collection<Population> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - PortDAO ps = IsisFishDAOHelper.getPortDAO(context); - Collection<Port> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - ResultDAO ps = IsisFishDAOHelper.getResultDAO(context); - Collection<Result> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); - Collection<PopulationSeasonInfo> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context); - Collection<Selectivity> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context); - Collection<SetOfVessels> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } -// { -// SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context); -// Collection<SimpleZone> list = ps.findAll(); -// } - { - StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); - Collection<StrategyMonthInfo> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context); - Collection<Strategy> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context); - Collection<TargetSpecies> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context); - Collection<TripType> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context); - Collection<VesselType> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - { - ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context); - Collection<Zone> list = ps.findAll(); - log.debug(list + " - " +ps.getClass().getName()); - } - context.rollbackTransaction(); - } -/* - public void testDelete() throws Exception { - TopiaContext context = this.context.beginTransaction(); - { - AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - AgeGroup o = (AgeGroup)i.next(); - ps.delete(o); - } - } - { - RegionDAO ps = IsisFishDAOHelper.getRegionDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Region o = (Region)i.next(); - ps.delete(o); - } - } - { - CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - CompositeZone o = (CompositeZone)i.next(); - ps.delete(o); - } - } - { - EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - EffortDescription o = (EffortDescription)i.next(); - ps.delete(o); - } - } - { - EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Emigration o = (Emigration)i.next(); - ps.delete(o); - } - } - { - EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Equation o = (Equation)i.next(); - ps.delete(o); - } - } - { - GearDAO ps = IsisFishDAOHelper.getGearDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Gear o = (Gear)i.next(); - ps.delete(o); - } - } - { - ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Immigration o = (Immigration)i.next(); - ps.delete(o); - } - } - { - LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - LengthGroup o = (LengthGroup)i.next(); - ps.delete(o); - } - } - { - MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - MappingZoneReproZoneRecru o = (MappingZoneReproZoneRecru)i.next(); - ps.delete(o); - } - } - { - CellDAO ps = IsisFishDAOHelper.getCellDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Cell o = (Cell)i.next(); - ps.delete(o); - } - } - { - SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Species o = (Species)i.next(); - ps.delete(o); - } - } - { - MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context); - Metier o = ps.create(); - } - { - MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - MetierSeasonInfo o = (MetierSeasonInfo)i.next(); - ps.delete(o); - } - } - { - MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Migration o = (Migration)i.next(); - ps.delete(o); - } - } - { - MonthDAO ps = IsisFishDAOHelper.getMonthDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Month o = (Month)i.next(); - ps.delete(o); - } - } - { - PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - PopulationGroup o = (PopulationGroup)i.next(); - ps.delete(o); - } - } - { - PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Population o = (Population)i.next(); - ps.delete(o); - } - } - { - PortDAO ps = IsisFishDAOHelper.getPortDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Port o = (Port)i.next(); - ps.delete(o); - } - } - { - ResultManagerDAO ps = IsisFishDAOHelper.getResultManagerDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - ResultStorage o = (ResultStorage)i.next(); - ps.delete(o); - } - } - { - SeasonDAO ps = IsisFishDAOHelper.getSeasonDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Season o = (Season)i.next(); - ps.delete(o); - } - } - { - PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - PopulationSeasonInfo o = (PopulationSeasonInfo)i.next(); - ps.delete(o); - } - } - { - SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Selectivity o = (Selectivity)i.next(); - ps.delete(o); - } - } - { - SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - SetOfVessels o = (SetOfVessels)i.next(); - ps.delete(o); - } - } - { - SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - SimpleZone o = (SimpleZone)i.next(); - ps.delete(o); - } - } - { - StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - StrategyMonthInfo o = (StrategyMonthInfo)i.next(); - ps.delete(o); - } - } - { - StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Strategy o = (Strategy)i.next(); - ps.delete(o); - } - } - { - TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - TargetSpecies o = (TargetSpecies)i.next(); - ps.delete(o); - } - } - { - TimeUnitDAO ps = IsisFishDAOHelper.getTimeUnitDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - TimeUnit o = (TimeUnit)i.next(); - ps.delete(o); - } - } - { - TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - TripType o = (TripType)i.next(); - ps.delete(o); - } - } - { - VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - VesselType o = (VesselType)i.next(); - ps.delete(o); - } - } - { - ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context); - Collection list = ps.findAll(); - for(Iterator i=list.iterator(); i.hasNext();){ - Zone o = (Zone)i.next(); - ps.delete(o); - } - } - context.rollbackTransaction(); - } - */ -} // Persistence - Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-02-03 13:54:41 UTC (rev 1777) +++ isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-02-03 16:04:35 UTC (rev 1778) @@ -2,6 +2,10 @@ import java.io.File; +import org.codelutin.util.FileUtil; + +import fr.ifremer.isisfish.IsisFish; + /** * Une classe pour avoir des choses utiles pour tous les tests d'isis * @@ -9,10 +13,12 @@ */ public abstract class TestUtils { - static File basedir; + protected static File basedir; - static File targetdir; + protected static File targetdir; + protected static File dirDatabase; + public static File getBasedir() { if (basedir == null) { String base = System.getProperty("basedir"); @@ -32,4 +38,31 @@ } return targetdir; } + + /** + * Create a temp dir and init isis with that temp dir as database. + * + * @throws Exception + */ + public static void init() throws Exception { + + File mavenTestDir = new File(getTargetdir() + File.separator + "surefire-workdir"); + dirDatabase = FileUtil.createTempDirectory("isisdbtest", "", mavenTestDir); + + System.setProperty("database.directory", dirDatabase.getAbsolutePath()); + System.setProperty("launch.ui", "false"); + + IsisFish.init(); + IsisFish.initVCS(); + } + + /** + * Delete created temp directory. + */ + public static void clean() { + if(dirDatabase != null) { + FileUtil.deleteRecursively(dirDatabase); + dirDatabase = null; + } + } } Copied: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java (from rev 1773, isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java) =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java 2009-02-03 16:04:35 UTC (rev 1778) @@ -0,0 +1,770 @@ +/* *##% +* Copyright (C) 2002, 2009 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 published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ + +package fr.ifremer.isisfish; + +import java.util.Collection; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.topia.TopiaContext; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import fr.ifremer.TestUtils; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.CellDAO; +import fr.ifremer.isisfish.entities.EffortDescription; +import fr.ifremer.isisfish.entities.EffortDescriptionDAO; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.FisheryRegionDAO; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.GearDAO; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.MetierDAO; +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.MetierSeasonInfoDAO; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationDAO; +import fr.ifremer.isisfish.entities.PopulationGroup; +import fr.ifremer.isisfish.entities.PopulationGroupDAO; +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.PopulationSeasonInfoDAO; +import fr.ifremer.isisfish.entities.Port; +import fr.ifremer.isisfish.entities.PortDAO; +import fr.ifremer.isisfish.entities.Result; +import fr.ifremer.isisfish.entities.ResultDAO; +import fr.ifremer.isisfish.entities.Season; +import fr.ifremer.isisfish.entities.SeasonDAO; +import fr.ifremer.isisfish.entities.Selectivity; +import fr.ifremer.isisfish.entities.SelectivityDAO; +import fr.ifremer.isisfish.entities.SetOfVessels; +import fr.ifremer.isisfish.entities.SetOfVesselsDAO; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.SpeciesDAO; +import fr.ifremer.isisfish.entities.Strategy; +import fr.ifremer.isisfish.entities.StrategyDAO; +import fr.ifremer.isisfish.entities.StrategyMonthInfo; +import fr.ifremer.isisfish.entities.StrategyMonthInfoDAO; +import fr.ifremer.isisfish.entities.TargetSpecies; +import fr.ifremer.isisfish.entities.TargetSpeciesDAO; +import fr.ifremer.isisfish.entities.TripType; +import fr.ifremer.isisfish.entities.TripTypeDAO; +import fr.ifremer.isisfish.entities.VesselType; +import fr.ifremer.isisfish.entities.VesselTypeDAO; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.entities.ZoneDAO; + +/** + * PersistenceTest. + * + * Created: 3 août 2004 + * + * @author Benjamin Poussin <poussin at codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class PersistenceTest { + + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(PersistenceTest.class); + + // Persistence + protected TopiaContext context = null; + protected RegionStorage rs; + + @BeforeClass + public static void init() throws Exception { + TestUtils.init(); + } + + @AfterClass + public static void clean() { + TestUtils.clean(); + } + + @Before + public void setUp() throws Exception { + rs = RegionStorage.create("test"); + context = rs.getStorage(); + } + + @After + public void tearDown() throws Exception { + rs.delete(false); + } + + @Test + public void testInstanciate() throws Exception { + TopiaContext context = this.context.beginTransaction(); + + FisheryRegionDAO fisheryRegionDAO = IsisFishDAOHelper.getFisheryRegionDAO(context); + FisheryRegion fisheryRegion = fisheryRegionDAO.create(); + log.debug(fisheryRegion + " - " + fisheryRegion.getClass().getName()); + + EffortDescriptionDAO effortDescriptionDAO = IsisFishDAOHelper.getEffortDescriptionDAO(context); + EffortDescription effortDescription = effortDescriptionDAO.create(); + log.debug(effortDescription + " - " + effortDescription.getClass().getName()); + + GearDAO gearDAO = IsisFishDAOHelper.getGearDAO(context); + Gear gear = gearDAO.create(); + log.debug(gear + " - " + gear.getClass().getName()); + + CellDAO cellDAO = IsisFishDAOHelper.getCellDAO(context); + Cell cell = cellDAO.create(); + log.debug(cell + " - " + cell.getClass().getName()); + + SpeciesDAO speciesDAO = IsisFishDAOHelper.getSpeciesDAO(context); + Species species = speciesDAO.create(); + log.debug(species + " - " + species.getClass().getName()); + + MetierDAO metierDAO = IsisFishDAOHelper.getMetierDAO(context); + Metier metier = metierDAO.create(); + log.debug(metier + " - " + metier.getClass().getName()); + + MetierSeasonInfoDAO metierSeasonInfoDAO = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); + MetierSeasonInfo metierSeasonInfo = metierSeasonInfoDAO.create(); + log.debug(metierSeasonInfo + " - " +metierSeasonInfo.getClass().getName()); + + PopulationGroupDAO populationGroupDAO = IsisFishDAOHelper.getPopulationGroupDAO(context); + PopulationGroup populationGroup = populationGroupDAO.create(); + log.debug(populationGroup + " - " + populationGroup.getClass().getName()); + + PopulationDAO populationDAO = IsisFishDAOHelper.getPopulationDAO(context); + Population population = populationDAO.create(); + log.debug(population + " - " + population.getClass().getName()); + + PortDAO portDAO = IsisFishDAOHelper.getPortDAO(context); + Port port = portDAO.create(); + log.debug(port + " - " + port.getClass().getName()); + + ResultDAO resultDAO = IsisFishDAOHelper.getResultDAO(context); + Result result = resultDAO.create(); + log.debug(result + " - " + result.getClass().getName()); + + SeasonDAO seasonDAO = IsisFishDAOHelper.getSeasonDAO(context); + Season season = seasonDAO.create(); + log.debug(season + " - " + season.getClass().getName()); + + PopulationSeasonInfoDAO PopulationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); + PopulationSeasonInfo PopulationSeasonInfo = PopulationSeasonInfoDAO.create(); + log.debug(PopulationSeasonInfo + " - " + PopulationSeasonInfo.getClass().getName()); + + SelectivityDAO selectivityDAO = IsisFishDAOHelper.getSelectivityDAO(context); + Selectivity selectivity = selectivityDAO.create(); + log.debug(selectivity + " - " + selectivity.getClass().getName()); + + SetOfVesselsDAO setOfVesselsDAO = IsisFishDAOHelper.getSetOfVesselsDAO(context); + SetOfVessels setOfVessels = setOfVesselsDAO.create(); + log.debug(setOfVessels + " - " + setOfVessels.getClass().getName()); + + StrategyMonthInfoDAO strategyMonthInfoDAO = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); + StrategyMonthInfo strategyMonthInfo = strategyMonthInfoDAO.create(); + log.debug(strategyMonthInfo + " - " + strategyMonthInfo.getClass().getName()); + + StrategyDAO strategyDAO = IsisFishDAOHelper.getStrategyDAO(context); + Strategy strategy = strategyDAO.create(); + log.debug(strategy + " - " + strategy.getClass().getName()); + + TargetSpeciesDAO targetSpeciesDAO = IsisFishDAOHelper.getTargetSpeciesDAO(context); + TargetSpecies targetSpecies = targetSpeciesDAO.create(); + log.debug(targetSpecies + " - " + targetSpecies.getClass().getName()); + + TripTypeDAO tripTypeDAO = IsisFishDAOHelper.getTripTypeDAO(context); + TripType tripType = tripTypeDAO.create(); + log.debug(tripType + " - " + tripType.getClass().getName()); + + VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(context); + VesselType vesselType = vesselTypeDAO.create(); + log.debug(vesselType + " - " + vesselType.getClass().getName()); + + ZoneDAO zoneDAO = IsisFishDAOHelper.getZoneDAO(context); + Zone zone = zoneDAO.create(); + log.debug(zone + " - " + zone.getClass().getName()); + + context.rollbackTransaction(); + } + + + @Test + public void testMakePersistence() throws Exception { + TopiaContext context = this.context.beginTransaction(); +// { +// AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context); +// AgeGroup o = ps.create(); +// o = ps.update(o); +// } + { + FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context); + FisheryRegion o = ps.create(); + o = ps.update(o); + } +// { +// CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context); +// CompositeZone o = ps.create(); +// o = ps.update(o); +// } + { + EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context); + EffortDescription o = ps.create(); + o = ps.update(o); + } +// { +// EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context); +// Emigration o = ps.create(); +// o = ps.update(o); +// } +// { +// EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context); +// Equation o = ps.create(); +// o = ps.update(o); +// } + { + GearDAO ps = IsisFishDAOHelper.getGearDAO(context); + Gear o = ps.create(); + o = ps.update(o); + } +// { +// ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context); +// Immigration o = ps.create(); +// o = ps.update(o); +// } +// { +// LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context); +// LengthGroup o = ps.create(); +// o = ps.update(o); +// } +// { +// MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context); +// MappingZoneReproZoneRecru o = ps.create(); +// o = ps.update(o); +// } + { + CellDAO ps = IsisFishDAOHelper.getCellDAO(context); + Cell o = ps.create(); + o = ps.update(o); + } + { + SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context); + Species o = ps.create(); + o = ps.update(o); + } + { + MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context); + Metier o = ps.create(); + o = ps.update(o); + } + { + MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); + MetierSeasonInfo o = ps.create(); + o = ps.update(o); + } +// { +// MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context); +// Migration o = ps.create(); +// o = ps.update(o); +// } + { +// try{ + PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context); + PopulationGroup o = ps.create(); + o = ps.update(o); +// assertTrue(false); // normalement on a pas le droit d'instancier une entity abstraite +// }catch(TopiaException eee){ +// assertTrue(true); +// } + } + { + PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context); + Population o = ps.create(); + o = ps.update(o); + } + { + PortDAO ps = IsisFishDAOHelper.getPortDAO(context); + Port o = ps.create(); + o = ps.update(o); + } + { + ResultDAO ps = IsisFishDAOHelper.getResultDAO(context); + Result o = ps.create(); + o = ps.update(o); + } + { + PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); + PopulationSeasonInfo o = ps.create(); + o = ps.update(o); + } + { + SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context); + Selectivity o = ps.create(); + o = ps.update(o); + } + { + SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context); + SetOfVessels o = ps.create(); + o = ps.update(o); + } +// { +// SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context); +// SimpleZone o = ps.create(); +// o = ps.update(o); +// } + { + StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); + StrategyMonthInfo o = ps.create(); + o = ps.update(o); + } + { + StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context); + Strategy o = ps.create(); + o = ps.update(o); + } + { + TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context); + TargetSpecies o = ps.create(); + o = ps.update(o); + } + { + TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context); + TripType o = ps.create(); + o = ps.update(o); + } + { + VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context); + VesselType o = ps.create(); + o = ps.update(o); + } + { + ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context); + Zone o = ps.create(); + o = ps.update(o); + } + context.rollbackTransaction(); + } + + @Test + public void testFindAll() throws Exception { + TopiaContext context = this.context.beginTransaction(); +// { +// AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context); +// Collection<AgeGroup> list = ps.findAll(); +// log.debug(list + " - " +ps.getClass().getName()); +// } + { + FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context); + Collection<FisheryRegion> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } +// { +// CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context); +// Collection list<CompositeZone> = ps.findAll(); +// } + { + EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context); + Collection<EffortDescription> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } +// { +// EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context); +// Collection<Emigration> list = ps.findAll(); +// log.debug(list + " - " +ps.getClass().getName()); +// } + { + GearDAO ps = IsisFishDAOHelper.getGearDAO(context); + Collection<Gear> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } +// { +// ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context); +// Collection<Immigration> list = ps.findAll(); +// log.debug(list + " - " +ps.getClass().getName()); +// } +// { +// LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context); +// Collection<LengthGroup> list = ps.findAll(); +// log.debug(list + " - " +ps.getClass().getName()); +// } +// { +// MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context); +// Collection<MappingZoneReproZoneRecru> list = ps.findAll(); +// log.debug(list + " - " +ps.getClass().getName()); +// } + { + CellDAO ps = IsisFishDAOHelper.getCellDAO(context); + Collection<Cell> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context); + Collection<Species> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context); + Collection<Metier> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); + Collection<MetierSeasonInfo> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } +// { +// MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context); +// Collection<Migration> list = ps.findAll(); +// log.debug(list + " - " +ps.getClass().getName()); +// } + { + PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context); + Collection<PopulationGroup> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context); + Collection<Population> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + PortDAO ps = IsisFishDAOHelper.getPortDAO(context); + Collection<Port> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + ResultDAO ps = IsisFishDAOHelper.getResultDAO(context); + Collection<Result> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); + Collection<PopulationSeasonInfo> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context); + Collection<Selectivity> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context); + Collection<SetOfVessels> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } +// { +// SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context); +// Collection<SimpleZone> list = ps.findAll(); +// } + { + StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); + Collection<StrategyMonthInfo> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context); + Collection<Strategy> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context); + Collection<TargetSpecies> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context); + Collection<TripType> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context); + Collection<VesselType> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + { + ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context); + Collection<Zone> list = ps.findAll(); + log.debug(list + " - " +ps.getClass().getName()); + } + context.rollbackTransaction(); + } +/* + public void testDelete() throws Exception { + TopiaContext context = this.context.beginTransaction(); + { + AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + AgeGroup o = (AgeGroup)i.next(); + ps.delete(o); + } + } + { + RegionDAO ps = IsisFishDAOHelper.getRegionDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Region o = (Region)i.next(); + ps.delete(o); + } + } + { + CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + CompositeZone o = (CompositeZone)i.next(); + ps.delete(o); + } + } + { + EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + EffortDescription o = (EffortDescription)i.next(); + ps.delete(o); + } + } + { + EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Emigration o = (Emigration)i.next(); + ps.delete(o); + } + } + { + EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Equation o = (Equation)i.next(); + ps.delete(o); + } + } + { + GearDAO ps = IsisFishDAOHelper.getGearDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Gear o = (Gear)i.next(); + ps.delete(o); + } + } + { + ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Immigration o = (Immigration)i.next(); + ps.delete(o); + } + } + { + LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + LengthGroup o = (LengthGroup)i.next(); + ps.delete(o); + } + } + { + MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + MappingZoneReproZoneRecru o = (MappingZoneReproZoneRecru)i.next(); + ps.delete(o); + } + } + { + CellDAO ps = IsisFishDAOHelper.getCellDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Cell o = (Cell)i.next(); + ps.delete(o); + } + } + { + SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Species o = (Species)i.next(); + ps.delete(o); + } + } + { + MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context); + Metier o = ps.create(); + } + { + MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + MetierSeasonInfo o = (MetierSeasonInfo)i.next(); + ps.delete(o); + } + } + { + MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Migration o = (Migration)i.next(); + ps.delete(o); + } + } + { + MonthDAO ps = IsisFishDAOHelper.getMonthDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Month o = (Month)i.next(); + ps.delete(o); + } + } + { + PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + PopulationGroup o = (PopulationGroup)i.next(); + ps.delete(o); + } + } + { + PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Population o = (Population)i.next(); + ps.delete(o); + } + } + { + PortDAO ps = IsisFishDAOHelper.getPortDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Port o = (Port)i.next(); + ps.delete(o); + } + } + { + ResultManagerDAO ps = IsisFishDAOHelper.getResultManagerDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + ResultStorage o = (ResultStorage)i.next(); + ps.delete(o); + } + } + { + SeasonDAO ps = IsisFishDAOHelper.getSeasonDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Season o = (Season)i.next(); + ps.delete(o); + } + } + { + PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + PopulationSeasonInfo o = (PopulationSeasonInfo)i.next(); + ps.delete(o); + } + } + { + SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Selectivity o = (Selectivity)i.next(); + ps.delete(o); + } + } + { + SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + SetOfVessels o = (SetOfVessels)i.next(); + ps.delete(o); + } + } + { + SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + SimpleZone o = (SimpleZone)i.next(); + ps.delete(o); + } + } + { + StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + StrategyMonthInfo o = (StrategyMonthInfo)i.next(); + ps.delete(o); + } + } + { + StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Strategy o = (Strategy)i.next(); + ps.delete(o); + } + } + { + TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + TargetSpecies o = (TargetSpecies)i.next(); + ps.delete(o); + } + } + { + TimeUnitDAO ps = IsisFishDAOHelper.getTimeUnitDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + TimeUnit o = (TimeUnit)i.next(); + ps.delete(o); + } + } + { + TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + TripType o = (TripType)i.next(); + ps.delete(o); + } + } + { + VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + VesselType o = (VesselType)i.next(); + ps.delete(o); + } + } + { + ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context); + Collection list = ps.findAll(); + for(Iterator i=list.iterator(); i.hasNext();){ + Zone o = (Zone)i.next(); + ps.delete(o); + } + } + context.rollbackTransaction(); + } + */ +} // Persistence + Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-02-03 13:54:41 UTC (rev 1777) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-02-03 16:04:35 UTC (rev 1778) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 + * Copyright (C) 2007, 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,53 +17,57 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * TestSimulatorResult.java - * - * Created: 4 janv. 07 12:06:18 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.simulator; -import fr.ifremer.TestUtils; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Result; -import fr.ifremer.isisfish.types.Date; -import junit.framework.TestCase; -import junit.framework.TestFailure; -import junit.framework.TestResult; -import junit.framework.TestSuite; +import java.io.File; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.DoubleBigVector; import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.topia.TopiaContext; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; -import java.io.File; -import java.util.Enumeration; -import java.util.List; +import fr.ifremer.TestUtils; +import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Result; +import fr.ifremer.isisfish.types.Date; -/** @author poussin */ +/** + * SimulationHelperTest. + * + * Created: 4 janv. 07 12:06:18 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SimulationHelperTest { -public class SimulationHelperTest extends TestCase { - private static final Log log = LogFactory.getLog(SimulationHelperTest.class); final static private String[] SIMULATION_ZIP_FILE = new String[]{ - //TC - 20090113 : remove the asrc to src when the zip file will be in correct db version, otherwise there is a ui asking to migrate - // or just desactivate the migration service ? - "asrc" + File.separator + "test" + File.separator + "java" + File.separator + "fr" + File.separator + "ifremer" + File.separator + "isisfish" + File.separator + "simulator" + File.separator + "SimulationTest.zip", + "src" + File.separator + "test" + File.separator + "resources" + File.separator + "simulations" + File.separator + "test-nonregression-20090203.zip", // put here other zip simulation test }; + + @BeforeClass + public static void init() throws Exception { + TestUtils.init(); + } + + @AfterClass + public static void clean() { + TestUtils.clean(); + } // public void testVerifResult() throws Exception { // try { @@ -126,11 +130,12 @@ 10000000000;20000000000;30000000000;40000000000;50000000000;60000000000;70000000000;80000000000;90000000000; */ + @Test public void testSimulate() throws Exception { + try { // par defaut on utilise des doubles pour les matrices MatrixFactory.setDefaultVectorClass(DoubleBigVector.class); - IsisFish.init(); for (String zipName : SIMULATION_ZIP_FILE) { // recuperation du fichier zip de la simulation de test @@ -139,7 +144,7 @@ // import de cette simulation String name = "simulation-test-" + System.currentTimeMillis(); SimulationStorage simRef = SimulationStorage.importAndRenameZip(zip, name + "-ref"); - + // import de la simulation avec un autre nom SimulationStorage sim = SimulationStorage.importAndRenameZip(zip, name); @@ -148,7 +153,8 @@ TopiaContext tx = sim.getStorage().beginTransaction(); tx.execute("DELETE from " + Result.class.getName()); tx.commitTransaction(); - + tx.closeContext(); + // lancement de la simulation // FIXME a remplacer avec SimulationService // SimulationHelper.simulate(null, sim); @@ -158,7 +164,7 @@ ResultStorage result = sim.getResultStorage(); List<String> resultNames = resultRef.getResultName(); - assertEquals(resultNames, result.getResultName()); + Assert.assertEquals(resultNames, result.getResultName()); Date lastDate = resultRef.getLastDate(); @@ -166,7 +172,7 @@ for (Date date = new Date(0); date.before(lastDate); date = date.next()) { for (String resultName : resultNames) { log.debug("Check result " + date + " " + resultName); - assertEquals("Date " + date.getDate() + " result " + resultName, + Assert.assertEquals("Date " + date.getDate() + " result " + resultName, resultRef.getMatrix(date, resultName), result.getMatrix(date, resultName)); } @@ -187,27 +193,4 @@ throw eee; } } - - public static void main(String[] args) { - TestSuite suite = new TestSuite(SimulationHelperTest.class); - TestResult result = new TestResult(); - suite.run(result); - if (result.wasSuccessful()) { - System.out.println("Test Ok"); - } else { - System.out.println("Test Faild"); - System.out.println("Failures"); - for (Enumeration e = result.failures(); e.hasMoreElements();) { - System.out.println(e.nextElement().toString()); - } - System.out.println("Errors"); - for (Enumeration e = result.errors(); e.hasMoreElements();) { - TestFailure eee = (TestFailure) e.nextElement(); - System.out.println(eee.toString()); - eee.thrownException().printStackTrace(); - } - } - } } - - Deleted: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationTest.zip =================================================================== (Binary files differ) Added: isis-fish/trunk/src/test/resources/simulations/test-nonregression-20090203.zip =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/test/resources/simulations/test-nonregression-20090203.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r1777 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 13:54:41 +0000 (Tue, 03 Feb 2009) New Revision: 1777 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Log: Disable topiacontext close, but should be fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-02-03 10:40:26 UTC (rev 1776) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-02-03 13:54:41 UTC (rev 1777) @@ -336,8 +336,10 @@ ui.setContextValue(regionStorage); ui.setContextValue(isisContext); ui.setContextValue(fisheryRegion); - isisContext.rollbackTransaction(); - isisContext.closeContext(); + // FIXME session shoul be closed + // but make lazy init later + //isisContext.rollbackTransaction(); + //isisContext.closeContext(); } } catch (Exception eee) { log.error("Can't load region", eee);

1 0

r1776 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore ui/input ui/simulator ui/widget/editor util
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 10:40:26 +0000 (Tue, 03 Feb 2009) New Revision: 1776 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java Log: Toujours fermer les TopiaContext apr?\195?\168s les avoir ouvert !!! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-02-03 10:39:29 UTC (rev 1775) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-02-03 10:40:26 UTC (rev 1776) @@ -496,27 +496,6 @@ } /** - * - * @return - * @throws fr.ifremer.isisfish.datastore.StorageException - * @deprecated ne plus utiliser car le context n'est jamais ferme, plutot - * utiliser {@link #getFisheryRegion(TopiaContext)} - */ - @Deprecated - public FisheryRegion getFisheryRegion() throws StorageException { - // FIXME voir si la methode est vraiment utilisée car le context n'est - // jamais fermé, ce qui est dérangeant - try { - TopiaContext tx = getStorage().beginTransaction(); - FisheryRegion result = getFisheryRegion(tx); - tx.commitTransaction(); - return result; - } catch (TopiaException eee) { - throw new StorageException(_("isisfish.error.get.fisheryRegion"), eee); - } - } - - /** * Retourne la {@link FisheryRegion} associee a cette simulation * @param context * @return @@ -651,8 +630,9 @@ try { - String oldRegionName = getFisheryRegion().getName(); - + TopiaContext tx = getStorage().beginTransaction(); + String oldRegionName = getFisheryRegion(tx).getName(); + // create a pseudo oldRegionName region tmpDir = FileUtil.createTempDirectory("extractRegionFromSimulation", ""); List<File> forZip = new ArrayList<File>(2); @@ -672,8 +652,13 @@ // import region with regionName as new name RegionStorage.importAndRenameZip(zipRegion, regionName); + + tx.commitTransaction(); + tx.closeContext(); } catch (IOException e) { throw new StorageException(e); + } catch (TopiaException e) { + throw new StorageException(e); } finally { if (tmpDir != null && !FileUtil.deleteRecursively(tmpDir)) { log.warn(_("isisfish.error.delete.file", tmpDir)); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-02-03 10:39:29 UTC (rev 1775) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-02-03 10:40:26 UTC (rev 1776) @@ -336,6 +336,8 @@ ui.setContextValue(regionStorage); ui.setContextValue(isisContext); ui.setContextValue(fisheryRegion); + isisContext.rollbackTransaction(); + isisContext.closeContext(); } } catch (Exception eee) { log.error("Can't load region", eee); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-03 10:39:29 UTC (rev 1775) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-03 10:40:26 UTC (rev 1776) @@ -40,6 +40,29 @@ package fr.ifremer.isisfish.ui.simulator; import static org.codelutin.i18n.I18n._; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.reflect.Field; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.log.UserLog; +import org.codelutin.topia.TopiaContext; + import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; @@ -60,30 +83,9 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; -import fr.ifremer.isisfish.ui.Common; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Field; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.log.UserLog; public class SimulAction { @@ -352,7 +354,10 @@ public List<Strategy> getStrategies() { List<Strategy> result = new ArrayList<Strategy>(); try { - result = RegionStorage.getFisheryRegion(param.getRegion().getStorage().beginTransaction()).getStrategy(); + TopiaContext tx = param.getRegion().getStorage().beginTransaction(); + result = RegionStorage.getFisheryRegion(tx).getStrategy(); + tx.rollbackTransaction(); + tx.closeContext(); } catch (Exception ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); showMsgBox(ex); @@ -371,13 +376,24 @@ // Population public List<Population> getPopulations() { - List<Species> species; + List<Population> result = new ArrayList<Population>(); try { - species = RegionStorage.getFisheryRegion(param.getRegion().getStorage().beginTransaction()).getSpecies(); + TopiaContext tx = param.getRegion().getStorage().beginTransaction(); + List<Species> species = RegionStorage.getFisheryRegion(tx).getSpecies(); for (Species s : species) { - result.addAll(s.getPopulation()); + Collection<Population> populations = s.getPopulation(); + + // FIXME initialiaze lazy hibernate collection + for(Population p : populations) { + p.getPopulationGroup().size(); + p.getPopulationZone().size(); + } + + result.addAll(populations); } + tx.rollbackTransaction(); + tx.closeContext(); } catch (Exception ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); showMsgBox(ex); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-02-03 10:39:29 UTC (rev 1775) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-02-03 10:40:26 UTC (rev 1776) @@ -168,7 +168,9 @@ case Topia: // on a un bean comme parametre try { - if (region==null) return null; + if (region==null) { + return null; + } TopiaContext context = region.getStorage().beginTransaction(); if (context != null) { List list = context.find("from " + type.getName()); @@ -177,6 +179,7 @@ editor = c; context.closeContext(); } + } catch (Exception eee) { log.warn("Can't get entity object for combobox", eee); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2009-02-03 10:39:29 UTC (rev 1775) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2009-02-03 10:40:26 UTC (rev 1776) @@ -95,6 +95,7 @@ result = tx.findByTopiaId(topiaId); // FIXME when after tx.closeContext we can continu to load object, call it here tx.commitTransaction(); + tx.closeContext(); } catch (TopiaException eee) { if (log.isWarnEnabled()) { log.warn("Can't find Entity from TopiaId " + topiaId, eee);

1 0