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

r1324 - trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: sletellier Date: 2008-08-29 19:29:03 +0000 (Fri, 29 Aug 2008) New Revision: 1324 Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml Log: Ajout d'un combobox pour choisir sont launcher Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl 2008-08-29 19:28:47 UTC (rev 1323) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl 2008-08-29 19:29:03 UTC (rev 1324) @@ -50,6 +50,7 @@ <td fill="Both" colspan="3" width="50%">fieldSimulParamsOptions</td> </tr> <tr> + <td colspan="3">comboSelLauncher</td> <td colspan="3">buttonSimulParamsSimulate</td> <td colspan="3">buttonSimulParamsAddQueue</td> </tr> Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml 2008-08-29 19:28:47 UTC (rev 1323) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml 2008-08-29 19:29:03 UTC (rev 1324) @@ -3,6 +3,7 @@ <panel id="simulParams" name="isisfish.params.title" constraints="simulParams" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/Params.xgl)"> <ContextDataSource id="RuleNames" context="current" source="RuleNames"/> + <ContextDataSource id="SimulationService" context="current" source="SimulationService"/> <label constraints="labelSimulParamsSelect" text="isisfish.params.loadOldSimulation"/> <panel constraints="panelSimulParamsSelectFilterActions"> @@ -141,9 +142,14 @@ actionCommand="update($fieldSimulOnlyExport/selected)"/> </panel> + <combobox constraints="comboSelLauncher" id="comboSelLauncher" + firstNull="true"> + <ComboBoxModel origin="getSimulationLaunchers(fr.ifremer.isisfish.simulator.launcher.SimulationService.getService())"/> + </combobox> + <button constraints="buttonSimulParamsSimulate" id="buttonSimulParamsSimulate" text="isisfish.common.simulate" - actionCommand="simulator.SimulatorAction.simulate($fieldSimulParamsName/text, $SimulationParameter, 'false', $simulTabs)"/> + actionCommand="simulator.SimulatorAction.simulate($fieldSimulParamsName/text, $SimulationParameter, 'false', $simulTabs, $comboSelLauncher/selectedItem)"/>  + + <ContextDataSource id="OldSimulationName" context="current" source="OldSimulationName"/> <ContextDataSource id="SimulationFilterModel" context="current" source="SimulationFilterModel"/> <ContextDataSource id="SimulationParameter" context="current" source="SimulationParameter"/>

1 0

r1323 - trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: sletellier Date: 2008-08-29 19:28:47 +0000 (Fri, 29 Aug 2008) New Revision: 1323 Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml Log: Ajout d'un combobox pour choisir sont launcher Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml 2008-08-29 19:28:21 UTC (rev 1322) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml 2008-08-29 19:28:47 UTC (rev 1323) @@ -26,7 +26,7 @@ | Local/Remote choice | +--> - + <!-- | | Trace/Cache option

1 0

r1322 - trunk/isis-fish/src/java/fr/ifremer/isisfish/actions
by sletellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: sletellier Date: 2008-08-29 19:28:21 +0000 (Fri, 29 Aug 2008) New Revision: 1322 Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/actions/SimulationAction.java Log: Ajout d'un combobox pour choisir sont launcher Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/actions/SimulationAction.java 2008-08-29 19:28:09 UTC (rev 1321) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/actions/SimulationAction.java 2008-08-29 19:28:21 UTC (rev 1322) @@ -75,7 +75,8 @@ } } - SimulationService.getService().submit(simulId, params, 0); + SimulationService.getService().submit(simulId, params, null, 0); + SimulationService.getService().getSimulationLaunchers(); } /**

1 0

r1321 - trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher
by sletellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: sletellier Date: 2008-08-29 19:28:09 +0000 (Fri, 29 Aug 2008) New Revision: 1321 Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Ajout d'un combobox pour choisir sont launcher Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2008-08-29 19:27:58 UTC (rev 1320) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2008-08-29 19:28:09 UTC (rev 1321) @@ -169,6 +169,14 @@ launcherError.put(sl, new MutableInt(0)); } + /** + * @return les SimulatorLauncher et leurs noms + */ + public List<SimulatorLauncher> getSimulationLaunchers(){ + List<SimulatorLauncher> result = new ArrayList<SimulatorLauncher>(executors.keySet()); + return result; + } + public Collection<SimulationExecutor> getSimulationExecutors() { return executors.values(); } @@ -308,11 +316,12 @@ * @param param les parametres de la simulation * @param priority la priorite de la simulation */ - public void submit(String id, SimulationParameter param, int priority) { + public void submit(String id, SimulationParameter param, SimulatorLauncher launcher, int priority) { // on l'ajoute tout de suite a la liste des simulations demandee SimulationControl control = new SimulationControl(id); SimulationItem item = new SimulationItem(control, param, null); SimulationJob job = new SimulationJob(this, item, priority); + job.setLauncher(launcher); fireStartEvent(job); // on construit le zip de la simulation @@ -558,26 +567,26 @@ } /** - * Prepare les fichiers qui seront utils à la simulation: + * Prepare les fichiers qui seront utils ï¿œ la simulation: * <li> scripts * <li> rules * <li> exports * <li> simulators * <li> export de la database de la region * <p> - * Le tout est zippé et le zip est retourné, il peut-être directement - * importé dans le SimulationStorage (en le renomant comme il faut + * Le tout est zippï¿œ et le zip est retournï¿œ, il peut-ï¿œtre directement + * importï¿œ dans le SimulationStorage (en le renomant comme il faut * importAndRenameZip). * <p> - * Ce zip est automatiquement supprimé a la fin de l'application. + * Ce zip est automatiquement supprimï¿œ a la fin de l'application. * * @param control le controleur * @param param les parametre de la simulation * @param compile si vrai la version compile des fichiers Java est aussi * mise dans le fichier zip. Cela peut servir pour les simulations locales * pour ne pas recompiler pour chaque simulation avec plan d'analyse - * @return un zip de simulation pour une simulation pret a être faite - * @throws SimulationException pour tout problème rencontré (IO,Topia...) + * @return un zip de simulation pour une simulation pret a ï¿œtre faite + * @throws SimulationException pour tout problï¿œme rencontrï¿œ (IO,Topia...) */ protected File prepareSimulationZipFile(SimulationControl control, SimulationParameter param, boolean compile) throws SimulationException { @@ -611,7 +620,7 @@ FileUtil.copy(new File(RuleStorage.getRuleDirectory(), name + ".java"), new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); } - // copie des regles reclamées par les plans d'analyse + // copie des regles reclamï¿œes par les plans d'analyse for(String name : param.getExtraRules()) { FileUtil.copy(new File(RuleStorage.getRuleDirectory(), name + ".java"), new File(tmpDirectory, RuleStorage.RULE_PATH + File.separator + name + ".java")); @@ -663,16 +672,16 @@ } /** - * Compile les fichiers présent dans le répertoire passé en - * parametre, ce répertoire est hiérarchisé en: rules, exports, simulators - * et scripts. Seul les fichiers des 3 premiers répertoire sont compilé - * les fichiers du dernier sont compilé par les dépendances qu'on les autres + * Compile les fichiers prï¿œsent dans le rï¿œpertoire passï¿œ en + * parametre, ce rï¿œpertoire est hiï¿œrarchisï¿œ en: rules, exports, simulators + * et scripts. Seul les fichiers des 3 premiers rï¿œpertoire sont compilï¿œ + * les fichiers du dernier sont compilï¿œ par les dï¿œpendances qu'on les autres * <p> * Il permet donc de compiler facilement tous les fichiers pour une * simulation * * @param control le controleur - * @param directory le répertoire où compiler + * @param directory le rï¿œpertoire oï¿œ compiler */ protected void compileAllFile(SimulationControl control, File directory) { @@ -681,9 +690,9 @@ // // Recherche des fichiers a compiler - // On ne prend pas les scripts, car ils sont tous copiés mais pas - // forcément util. Lors de la compilation des autres fichiers, les - // script servant réellement seront automatiquement compilé + // On ne prend pas les scripts, car ils sont tous copiï¿œs mais pas + // forcï¿œment util. Lors de la compilation des autres fichiers, les + // script servant rï¿œellement seront automatiquement compilï¿œ List<File> fileToCompile = new ArrayList<File>();

1 0

r1320 - trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator
by sletellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: sletellier Date: 2008-08-29 19:27:58 +0000 (Fri, 29 Aug 2008) New Revision: 1320 Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Ajout d'un combobox pour choisir sont launcher Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2008-08-29 19:27:25 UTC (rev 1319) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2008-08-29 19:27:58 UTC (rev 1320) @@ -1,5 +1,5 @@ /* - * *##% Copyright (C) 2006 Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2006 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 @@ -89,7 +89,7 @@ /** nom de la region sur lequel on simule */ protected String regionName = ""; - /** nombre d'année sur lequel on souhaite simuler */ + /** nombre d'annï¿œe sur lequel on souhaite simuler */ protected int numberOfYear = 1; /** le nom de l'objet script a utiliser pour faire la simulation */ @@ -107,13 +107,13 @@ /** la liste des populations a utiliser pour la simulation */ protected List<Population> populations = new ArrayList<Population>(); - /** les effectifs initiaux des différentes population */ + /** les effectifs initiaux des diffï¿œrentes population */ protected Map<Population, MatrixND> numbers = new HashMap<Population, MatrixND>(); /** la liste des regles de gestions a utiliser pour la simulation */ protected List<Rule> rules = new ArrayList<Rule>(); - /** la liste des regles potentiellement ajoutée par les plans d'analyse */ + /** la liste des regles potentiellement ajoutï¿œe par les plans d'analyse */ protected List<String> extraRules = new ArrayList<String>(); /** la liste des plans a utiliser pour la simulation */ @@ -137,7 +137,7 @@ protected String analysePlan = ""; /** le numero de sequence de la liste des plans d'analyse, le premier - * élement du plan doit etre 0. Si la simulation ne fait pas partie d'un + * ï¿œlement du plan doit etre 0. Si la simulation ne fait pas partie d'un * plan la valeur est -1 */ protected int analysePlanNumber = -1; @@ -149,21 +149,21 @@ /** * si vrai seul les exports automatiques ne sont souhaiter, la simulation - * pourrait etre supprimée a la fin + * pourrait etre supprimï¿œe a la fin */ protected boolean onlyExport = false; transient protected RegionStorage region = null; - /** le niveau de log du simulateur à utiliser pendant la simulation , par default info */ + /** le niveau de log du simulateur ï¿œ utiliser pendant la simulation , par default info */ protected String simulLogLevel = "info"; - /** le niveau de log des scripts à utiliser pendant la simulation , par default info */ + /** le niveau de log des scripts ï¿œ utiliser pendant la simulation , par default info */ protected String scriptLogLevel = "info"; - /** le niveau de log des librairies à utiliser pendant la simulation , par default info */ + /** le niveau de log des librairies ï¿œ utiliser pendant la simulation , par default info */ protected String libLogLevel = "error"; /** * Permet de verifier que tous les parametres sont bon. Si ce n'est pas le - * cas la liste retournée contient la liste des messages d'erreur. + * cas la liste retournï¿œe contient la liste des messages d'erreur. * * @return */ @@ -873,7 +873,7 @@ public String getExportDirectory() { return this.exportDirectory; } - + /** * @param exportDirectory The exportDirectory to set. */

1 0

r1319 - trunk/isis-fish/src/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: sletellier Date: 2008-08-29 19:27:25 +0000 (Fri, 29 Aug 2008) New Revision: 1319 Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorAction.java Log: Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorAction.java =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorAction.java 2008-08-29 18:03:29 UTC (rev 1318) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorAction.java 2008-08-29 19:27:25 UTC (rev 1319) @@ -1,6 +1,6 @@ /* *##% * Copyright (C) 2006 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Ifremer, Code Lutin, Cï¿œdric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -45,6 +45,7 @@ import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.SimulationProperties; import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; import org.apache.commons.logging.Log; @@ -257,7 +258,7 @@ */ static public Object simulate(Context uiContext, AbstractFrame frame, String simulId, SimulationParameter param, - boolean inQueue, JTabbedPane tabs) { + boolean inQueue, JTabbedPane tabs, SimulatorLauncher luncher) { log.debug("call simulate"); try { uiContext.setData("SimulationLaunched", false); @@ -271,7 +272,7 @@ } else { SimulationParameter p = param.copy(); - SimulationService.getService().submit(simulId, p, 0); + SimulationService.getService().submit(simulId, p, luncher, 0); selectTab(tabs, true, 6); }

1 0

r1318 - trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: chatellier Date: 2008-08-29 18:03:29 +0000 (Fri, 29 Aug 2008) New Revision: 1318 Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml Log: Remove unsed class Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml 2008-08-29 17:39:49 UTC (rev 1317) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml 2008-08-29 18:03:29 UTC (rev 1318) @@ -90,8 +90,6 @@ <entry key="JEditTextArea"><value>javax.swing.JTextArea</value></entry>  <entry key="StrategyMonthPanel"><value>javax.swing.JTextField</value></entry> - <entry key="SimulationQueueModel"><value>fr.ifremer.isisfish.simulator.SimulationQueueModel</value></entry> - <entry key="SimulationDoneQueueModel"><value>fr.ifremer.isisfish.simulator.SimulationDoneQueueModel</value></entry> <entry key="OpenMapToolSet"><value>com.bbn.openmap.gui.OMToolSet</value></entry> <entry key="OpenMap"><value>fr.ifremer.isisfish.map.IsisMapBean</value></entry> <entry key="StatusBar"><value>org.codelutin.widget.StatusBar</value></entry>

1 0

r1317 - in trunk/isis-fish/src: resources/images site/fr/rst/v3/devel/images
by bpoussin＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: bpoussin Date: 2008-08-29 17:39:49 +0000 (Fri, 29 Aug 2008) New Revision: 1317 Added: trunk/isis-fish/src/resources/images/stock_connect.png trunk/isis-fish/src/resources/images/stock_disconnect.png Modified: trunk/isis-fish/src/site/fr/rst/v3/devel/images/IsisFishModel.png Log: ajout des images de connexaion au serveur Added: trunk/isis-fish/src/resources/images/stock_connect.png =================================================================== (Binary files differ) Property changes on: trunk/isis-fish/src/resources/images/stock_connect.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/isis-fish/src/resources/images/stock_disconnect.png =================================================================== (Binary files differ) Property changes on: trunk/isis-fish/src/resources/images/stock_disconnect.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/isis-fish/src/site/fr/rst/v3/devel/images/IsisFishModel.png =================================================================== (Binary files differ)

1 0

r1316 - in trunk/isis-fish/src: java/fr/ifremer/isisfish/simulator uimodel/fr/ifremer/isisfish/ui uimodel/fr/ifremer/isisfish/ui/simulator
by bpoussin＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: bpoussin Date: 2008-08-29 17:38:51 +0000 (Fri, 29 Aug 2008) New Revision: 1316 Added: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Removed: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xgl trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xml Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml Log: modif pour que la queue s'aaffiche convenablement Deleted: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2008-08-29 15:39:43 UTC (rev 1315) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2008-08-29 17:38:51 UTC (rev 1316) @@ -1,365 +0,0 @@ -/* *##% - * Copyright (C) 2006 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as 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. - *##%*/ - -/* * - * PopulationMonitor.java - * - * Created: 21 août 2006 15:41:18 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package fr.ifremer.isisfish.simulator; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.keyvalue.MultiKey; -import org.apache.commons.collections.map.MultiKeyMap; -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 fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.types.Month; - - -/** - * - * @author poussin - */ -public class PopulationMonitor { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(PopulationMonitor.class); - - /** current number of fish by Pop */ - protected Map<Population, MatrixND> Ns = new HashMap<Population, MatrixND>(); - /** reproduction key: <date, pop> value:<MatrixND> */ - protected MultiKeyMap reproductions = new MultiKeyMap(); - /** discard key: <date, pop> value:<MatrixND> */ - protected MultiKeyMap discards = new MultiKeyMap(); - /** catch per population, only last catch is remaining */ - protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); - /** catch per population, only last catch is remaining */ - protected Map<Population, MatrixND> holdCatchs = new HashMap<Population, MatrixND>(); - protected double totalHoldCatch = 0; - - /** - * Return all population actualy in PopulationMonitor - * @return new list of Population - */ - public List<Population> getPopulations() { - ArrayList<Population> result = new ArrayList<Population>(Ns.keySet()); - return result; - } - - /** - * Return current biomass for species - * @param species - * @return - */ - public double getBiomass(Species species) { - double result = 0; - - for (Population pop : species.getPopulation()) { - result += getBiomass(pop); - } - - return result; - } - - /** - * Return current biomass for population - * @param pop - * @return - */ - public double getBiomass(Population pop) { - double result = 0; - - MatrixND n = getN(pop); - if (n != null) { - n = n.sumOverDim(1); - for (MatrixIterator i=n.iterator(); i.next();){ - Object [] coord = i.getSemanticsCoordinates(); - PopulationGroup group = (PopulationGroup)coord[0]; - result += i.getValue() * group.getMeanWeight(); - } - } - - return result; - } - - /** - * Return current numbers for population - * @param pop - * @return - */ - public MatrixND getN(Population pop) { - MatrixND result = Ns.get(pop); - - if (result != null) { - // change semantics with list from argument to ensure that - // semantics don't used too old context - result.setSemantics(0, pop.getPopulationGroup()); - result.setSemantics(1, pop.getPopulationZone()); - } - - return result; - } - - public void setN(Population pop, MatrixND mat) { - Ns.put(pop, mat); - } - - /** - * @return Returns the reproduction. - */ - public MatrixND getReproduction(Date date, Population pop) { - return (MatrixND)this.reproductions.get(date, pop); - } - - /** - * @param reproduction The reproduction to set. - */ - public void setReproduction(Date date, Population pop, MatrixND repro) { - this.reproductions.put(date, pop, repro); - } - - /** - * Applique de la mortalite naturelle aux poissons qui sont pas encore - * dans les classes de populations. (Reproduction) - * @param pop - */ - public void applyReproductionMortality(Population pop) { - for (MapIterator i=reproductions.mapIterator(); i.hasNext();) { - i.next(); - MultiKey key = (MultiKey)i.getKey(); - if (pop.equals(key.getKey(1))) { - MatrixND reproduction = (MatrixND)i.getValue(); - if (log.isTraceEnabled()) { - log.trace("Matrix repro before mortality: " + reproduction); - } - for(MatrixIterator mi=reproduction.iterator(); mi.next();){ - Object[] sems = mi.getSemanticsCoordinates(); - Zone z = (Zone)sems[0]; - double coeff = pop.getNaturalDeathBirth(z); - if (log.isTraceEnabled()) { - log.trace("NaturalDeath zone " + z + "=" + coeff); - } - mi.setValue(mi.getValue() * Math.exp(-coeff/Month.NUMBER_OF_MONTH)); - } - if (log.isTraceEnabled()) { - log.trace("Matrix repro after mortality: " + reproduction); - } - } - } - } - - /** - * @todo les reproductions qui sont trop veille pour encore servir - * doivent être supprimées. c-a-d date < currentDate - etalement - gap between repro recru - * Une autre facon de faire est de supprimer les repro == 0 car normalement - * toute la repro doit etre utilisé au bout d'un certain temps - * - * @param date - * @param pop - * @return - */ - public MatrixND getRecruitment(Date date, Population pop) { - MatrixND matEtalement = pop.getRecruitmentDistribution(); - int etalement = matEtalement.getDim(0); - - MatrixND result = MatrixFactory.getInstance().create( - new List[]{pop.getPopulationGroup(), pop.getPopulationZone()}); - - // pour chaque - for(int e=0; e<etalement; e++){ - // recuperation de la reproduction stucture en zone repro - Date d = new Date(date.getDate() - e - - pop.getMonthGapBetweenReproRecrutement()); - MatrixND repro = (MatrixND)reproductions.get(d, pop); - - if(repro != null){ // si une repro existe pour le mois - - // on fait la correspondance entre les zones repro et - // recrutement - - PopulationGroup classe; - int indiceClasse = 0; - // si on a change d'annee le recrutement ne se fait pas en - // classe 0 mais en classe 1, si on a change 2 fois d'annee - // le recrutement se fait en age 2, etc. - classe = pop.getPopulationGroup().get(indiceClasse); - - List<Zone> zoneRepros = pop.getReproductionZone(); - - // on multiplie la repro par le coeff de recrutement - double coeff = matEtalement.getValue(e); - - MatrixND matRepro = repro.copy(); - matRepro = matRepro.mults(coeff); - - matRepro.setSemantics(0, zoneRepros); - - MatrixND mapping = pop.getMappingZoneReproZoneRecru(); - for(Zone zoneRepro : zoneRepros){ - MatrixND submapping = mapping.getSubMatrix(0, new Object[]{zoneRepro}); - for (MatrixIterator i=submapping.iterator(); i.hasNext();) { - i.next(); - Object[] sem = i.getSemanticsCoordinates(); - Zone zoneRecru = (Zone)sem[1]; - double c = i.getValue(); - result.setValue(classe, zoneRecru, c*matRepro.getValue(zoneRepro) - +result.getValue(classe, zoneRecru)); - } - } - } - } - - if(pop.getSpecies().getAgeGroupType()){ - // conversion et retour de la matrice en vecteur - MatrixND N = pop.N2DToN1D(result); - // on applique les migrations et le changement d'age sur le resultat - // on suppose que la reproduction est toujours dans une seul saison - Date dateRepro = new Date(date.getDate() - - pop.getMonthGapBetweenReproRecrutement()); - - // recherche les saisons des differents mois entre les deux dates - List<PopulationSeasonInfo> infos = pop.getPopulationSeasonInfo(); - List<PopulationSeasonInfo> usedSeasons = new ArrayList<PopulationSeasonInfo>(); - - while (date.after(dateRepro)) { - dateRepro = dateRepro.next(); - Month month = dateRepro.getMonth(); - for (PopulationSeasonInfo info : infos) { - if (month.equals(info.getFirstMonth())) { - usedSeasons.add(info); - dateRepro = new Date(dateRepro.getDate() + info.getMonths().size() - 1); // -1 because, for have next() - break; - } - } - } - - for(PopulationSeasonInfo info : usedSeasons){ - Month month = info.getFirstMonth(); - MatrixND CA = info.getGroupChangeMatrix(month); - MatrixND MI = info.getMigrationMatrix(month, result); - MatrixND tmp0 = N.mult(CA); - MatrixND tmp2 = tmp0.mult(MI); - N = tmp2; - } - result = pop.split2D(N); - } - return result; - } - - /** - * @param catchPerStrategyMet - */ - public void holdCatch(Population pop, MatrixND catchPerStrategyMet) { - catchs.put(pop, catchPerStrategyMet); - - MatrixND holdCatch = holdCatchs.get(pop); - if (holdCatch == null) { - holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); - holdCatchs.put(pop, holdCatch); - } else { - holdCatch.add(catchPerStrategyMet); - } - - // compute total - for(MatrixIterator i=catchPerStrategyMet.iterator(); i.next();){ - this.totalHoldCatch += i.getValue(); - } - - } - - /** - * @param pop - * @return - */ - public MatrixND getCatch(Population pop) { - MatrixND result = catchs.get(pop); - return result; - } - - /** - * @param pop - * @return - */ - public MatrixND getHoldCatch(Population pop) { - MatrixND result = holdCatchs.get(pop); - return result; - } - - /** - * @param pop - * @return - */ - public double getTotalHoldCatch(Population pop) { - double result = totalHoldCatch; - return result; - } - - /** - * raz capture cumulée de toutes les pops - */ - public void clearCatch() { - catchs.clear(); - holdCatchs.clear(); - totalHoldCatch = 0; - } - - /** - * @param date - * @param pop - * @return - */ - public MatrixND getDiscard(Date date, Population pop) { - MatrixND result = (MatrixND)discards.get(date, pop); - return result; - } - - public void addDiscard(Date date, Population pop, MatrixND discard) { - MatrixND tmp = (MatrixND)discards.get(date, pop); - if (tmp == null) { - tmp = discard.copy(); - discards.put(date, pop, tmp); - } else { - tmp.add(discard); - } - } -} - - Copied: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java (from rev 1300, branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java) =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java (rev 0) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2008-08-29 17:38:51 UTC (rev 1316) @@ -0,0 +1,399 @@ +/* *##% + * Copyright (C) 2006 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as 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. + *##%*/ + +/* * + * PopulationMonitor.java + * + * Created: 21 août 2006 15:41:18 + * + * @author poussin + * @version $Revision: 428 $ + * + * Last update: $Date: 2007-10-15 14:56:13 +0200 (lun, 15 oct 2007) $ + * by : $Author: bpoussin $ + */ + +package fr.ifremer.isisfish.simulator; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +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 fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationGroup; +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.types.Date; +import fr.ifremer.isisfish.types.Month; +import java.util.Collections; + + +/** + * Classe permettant le suivi des populations de la simulation. + * <p> + * Cette classe est normalement multi-thread safe + * <p> + * FIXME: certain calcul sont les memes que ceux implanter dans les scripts + * a cause du groupe des juveniles qui n'est pas un vrai groupe de population. + * Il serait bon que ce groupe deviennent un vrai groupe et que ce code specifique + * puisse etre supprimer. + * + * + * @author poussin + */ +public class PopulationMonitor { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(PopulationMonitor.class); + + /** La liste des pops monitorer par cette instance */ + protected List<Population> pops = null; + /** current number of fish by Pop */ + protected Map<Population, MatrixND> Ns = new HashMap<Population, MatrixND>(); + /** reproduction key: <date, pop> value:<MatrixND> */ + protected Map<Population, Map<Date, MatrixND>> reproductions = new HashMap<Population, Map<Date, MatrixND>>(); + /** discard key: <date, pop> value:<MatrixND> */ + protected Map<Population, Map<Date, MatrixND>> discards = new HashMap<Population, Map<Date, MatrixND>>(); + /** catch per population, only last catch is remaining */ + protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); + /** catch per population, only last catch is remaining */ + protected Map<Population, MatrixND> holdCatchs = new HashMap<Population, MatrixND>(); + protected double totalHoldCatch = 0; + + /** + * Initialise le monitor pour l'ensemble de pop passe en parametre. + * Normalement cet init est fait dans le thread principale de la simulation + * et il n'y a pas de besoin de le synchroniser. + * + * Cet init permet d'avoir ensuite le maxime de variable en lecture, et donc + * de permettre le multithreading de facon legere (pas de synchronise) et + * sur (pas de concurent modification exception) + * + * @param pops + */ + public void init(List<Population> pops) { + this.pops = Collections.unmodifiableList(new ArrayList<Population>(pops)); + for (Population pop : this.pops) { + reproductions.put(pop, new HashMap<Date, MatrixND>()); + discards.put(pop, new HashMap<Date, MatrixND>()); + } + } + + /** + * Return all population actualy in PopulationMonitor + * @return new list of Population + */ + public List<Population> getPopulations() { + return pops; + } + + /** + * Return current biomass for species + * @param species + * @return + */ + public double getBiomass(Species species) { + double result = 0; + + for (Population pop : species.getPopulation()) { + result += getBiomass(pop); + } + + return result; + } + + /** + * Return current biomass for population + * @param pop + * @return + */ + public double getBiomass(Population pop) { + double result = 0; + + MatrixND n = getN(pop); + if (n != null) { + n = n.sumOverDim(1); + for (MatrixIterator i=n.iterator(); i.next();){ + Object [] coord = i.getSemanticsCoordinates(); + PopulationGroup group = (PopulationGroup)coord[0]; + result += i.getValue() * group.getMeanWeight(); + } + } + + return result; + } + + /** + * Return current numbers for population + * @param pop + * @return + */ + public MatrixND getN(Population pop) { + MatrixND result = Ns.get(pop); + + if (result != null) { + // change semantics with list from argument to ensure that + // semantics don't used too old context + result.setSemantics(0, pop.getPopulationGroup()); + result.setSemantics(1, pop.getPopulationZone()); + } + + return result; + } + + public void setN(Population pop, MatrixND mat) { + Ns.put(pop, mat); + } + + /** + * @return Returns the reproduction. + */ + public MatrixND getReproduction(Date date, Population pop) { + return this.reproductions.get(pop).get(date); + } + + /** + * @param reproduction The reproduction to set. + */ + public void setReproduction(Date date, Population pop, MatrixND repro) { + reproductions.get(pop).put(date, repro); + } + + /** + * Applique de la mortalite naturelle aux poissons qui sont pas encore + * dans les classes de populations. (Reproduction) + * @param pop + */ + public void applyReproductionMortality(Population pop) { + for (MatrixND reproduction : reproductions.get(pop).values()) { + if (log.isTraceEnabled()) { + log.trace("Matrix repro before mortality: " + reproduction); + } + + for (MatrixIterator mi = reproduction.iterator(); mi.next();) { + Object[] sems = mi.getSemanticsCoordinates(); + Zone z = (Zone) sems[0]; + double coeff = pop.getNaturalDeathBirth(z); + if (log.isTraceEnabled()) { + log.trace("NaturalDeath zone " + z + "=" + coeff); + } + mi.setValue(mi.getValue() * Math.exp(-coeff / Month.NUMBER_OF_MONTH)); + } + if (log.isTraceEnabled()) { + log.trace("Matrix repro after mortality: " + reproduction); + } + } + } + + /** + * @todo les reproductions qui sont trop veille pour encore servir + * doivent être supprimées. c-a-d date < currentDate - etalement - gap between repro recru + * Une autre facon de faire est de supprimer les repro == 0 car normalement + * toute la repro doit etre utilisé au bout d'un certain temps + * + * @param date + * @param pop + * @return + */ + public MatrixND getRecruitment(Date date, Population pop) { + MatrixND matEtalement = pop.getRecruitmentDistribution(); + int etalement = matEtalement.getDim(0); + + MatrixND result = MatrixFactory.getInstance().create( + new List[]{pop.getPopulationGroup(), pop.getPopulationZone()}); + + // pour chaque + for(int e=0; e<etalement; e++){ + // recuperation de la reproduction stucture en zone repro + Date d = new Date(date.getDate() - e - + pop.getMonthGapBetweenReproRecrutement()); + MatrixND repro = (MatrixND)reproductions.get(pop).get(d); + + if(repro != null){ // si une repro existe pour le mois + + // on fait la correspondance entre les zones repro et + // recrutement + + PopulationGroup classe; + int indiceClasse = 0; + // si on a change d'annee le recrutement ne se fait pas en + // classe 0 mais en classe 1, si on a change 2 fois d'annee + // le recrutement se fait en age 2, etc. + classe = pop.getPopulationGroup().get(indiceClasse); + + List<Zone> zoneRepros = pop.getReproductionZone(); + + // on multiplie la repro par le coeff de recrutement + double coeff = matEtalement.getValue(e); + + MatrixND matRepro = repro.copy(); + matRepro = matRepro.mults(coeff); + + matRepro.setSemantics(0, zoneRepros); + + MatrixND mapping = pop.getMappingZoneReproZoneRecru(); + for(Zone zoneRepro : zoneRepros){ + MatrixND submapping = mapping.getSubMatrix(0, new Object[]{zoneRepro}); + for (MatrixIterator i=submapping.iterator(); i.hasNext();) { + i.next(); + Object[] sem = i.getSemanticsCoordinates(); + Zone zoneRecru = (Zone)sem[1]; + double c = i.getValue(); + result.setValue(classe, zoneRecru, c*matRepro.getValue(zoneRepro) + +result.getValue(classe, zoneRecru)); + } + } + } + } + + if(pop.getSpecies().getAgeGroupType()){ + // conversion et retour de la matrice en vecteur + MatrixND N = pop.N2DToN1D(result); + // on applique les migrations et le changement d'age sur le resultat + // on suppose que la reproduction est toujours dans une seul saison + Date dateRepro = new Date(date.getDate() - + pop.getMonthGapBetweenReproRecrutement()); + + // recherche les saisons des differents mois entre les deux dates + List<PopulationSeasonInfo> infos = pop.getPopulationSeasonInfo(); + List<PopulationSeasonInfo> usedSeasons = new ArrayList<PopulationSeasonInfo>(); + + while (date.after(dateRepro)) { + dateRepro = dateRepro.next(); + Month month = dateRepro.getMonth(); + for (PopulationSeasonInfo info : infos) { + if (month.equals(info.getFirstMonth())) { + usedSeasons.add(info); + dateRepro = new Date(dateRepro.getDate() + info.getMonths().size() - 1); // -1 because, for have next() + break; + } + } + } + + for(PopulationSeasonInfo info : usedSeasons){ + Month month = info.getFirstMonth(); + MatrixND CA = info.getGroupChangeMatrix(month); + MatrixND MI = info.getMigrationMatrix(month, result); + MatrixND tmp0 = N.mult(CA); + MatrixND tmp2 = tmp0.mult(MI); + N = tmp2; + } + result = pop.split2D(N); + } + return result; + } + + /** + * @param catchPerStrategyMet + */ + public void holdCatch(Population pop, MatrixND catchPerStrategyMet) { + catchs.put(pop, catchPerStrategyMet); + + MatrixND holdCatch = holdCatchs.get(pop); + if (holdCatch == null) { + holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); + holdCatchs.put(pop, holdCatch); + } else { + holdCatch.add(catchPerStrategyMet); + } + + // compute total + for(MatrixIterator i=catchPerStrategyMet.iterator(); i.next();){ + this.totalHoldCatch += i.getValue(); + } + + } + + /** + * @param pop + * @return + */ + public MatrixND getCatch(Population pop) { + MatrixND result = catchs.get(pop); + return result; + } + + /** + * @param pop + * @return + */ + public MatrixND getHoldCatch(Population pop) { + MatrixND result = holdCatchs.get(pop); + return result; + } + + /** + * @param pop + * @return + */ + public double getTotalHoldCatch(Population pop) { + double result = totalHoldCatch; + return result; + } + + /** + * raz capture cumulée de toutes les pops + */ + public void clearCatch() { + catchs.clear(); + holdCatchs.clear(); + totalHoldCatch = 0; + } + + /** + * @param date + * @param pop + * @return + */ + public MatrixND getDiscard(Date date, Population pop) { + MatrixND result = discards.get(pop).get(date); + return result; + } + + /** + * FIXME: discards n'est jamais vider, on le conserve pour toutes les annees + * il serait bon de faire un peu le menage de temps en temps. + * + * @param date + * @param pop + * @param discard + */ + public void addDiscard(Date date, Population pop, MatrixND discard) { + Map<Date, MatrixND> oneDiscard = discards.get(pop); + synchronized(oneDiscard) { + MatrixND tmp = oneDiscard.get(date); + if (tmp == null) { + tmp = discard.copy(); + discards.get(pop).put(date, tmp); + } else { + tmp.add(discard); + } + } + } +} + + Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl 2008-08-29 15:39:43 UTC (rev 1315) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl 2008-08-29 17:38:51 UTC (rev 1316) @@ -5,6 +5,7 @@ <td fill="Both" width="100%">labelStatus</td> <td fill="Both" width="5%">stopCommand</td> <td fill="Both" width="5%">memoryStatus</td> + <td fill="Both" width="5%">vcs</td> </tr> </table> </layout> Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml 2008-08-29 15:39:43 UTC (rev 1315) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml 2008-08-29 17:38:51 UTC (rev 1316) @@ -1,4 +1,5 @@ -<panel border="LoweredBevelBorder" layout="XMLGridLayout(fr/ifremer/isisfish/ui/StatusBar.xgl)"> +<panel border="LoweredBevelBorder" + layout="XMLGridLayout(fr/ifremer/isisfish/ui/StatusBar.xgl)"> <ActionMonitor postThreadCommand="xpath:setVisible($stopCommand, 'false')" progressStartTime="5" messageTime="7" @@ -14,4 +15,6 @@ <MemoryStatus constraints="memoryStatus"/> + <VCSConnectionState constraints="vcs"/> + </panel> Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml 2008-08-29 15:39:43 UTC (rev 1315) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/context.xml 2008-08-29 17:38:51 UTC (rev 1316) @@ -66,6 +66,7 @@ <map>   + <entry key="VCSConnectionState"><value>fr.ifremer.isisfish.ui.widget.VCSConnectionState</value></entry> <entry key="Queue"><value>fr.ifremer.isisfish.ui.simulator.Queue</value></entry> <entry key="MatrixPanel"><value>org.codelutin.math.matrix.gui.MatrixPanelEditor</value></entry> <entry key="OpenMapToolPanel"><value>fr.ifremer.isisfish.map.OpenMapToolPanel</value></entry> Deleted: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xgl =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xgl 2008-08-29 15:39:43 UTC (rev 1315) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xgl 2008-08-29 17:38:51 UTC (rev 1316) @@ -1,18 +0,0 @@ -<layout> - <table cellspacing="2"> - <tr> - <td fill="Both" height="40%" width="100%" colspan="3">queueTable</td> - </tr> - <tr> - <td fill="Both" height="40%" width="100%" colspan="3">queueTableDone</td> - </tr> - <tr> - <td height="20%" width="35%">buttonSimulQueueStart</td> - <td height="20%" width="35%">buttonSimulQueueRemove</td> - <td height="20%" width="30%">buttonSimulQueueShowLog</td> - </tr> - </table> -</layout> - - - Deleted: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xml 2008-08-29 15:39:43 UTC (rev 1315) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue.xml 2008-08-29 17:38:51 UTC (rev 1316) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<Queue/> - \ No newline at end of file Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml 2008-08-29 15:39:43 UTC (rev 1315) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml 2008-08-29 17:38:51 UTC (rev 1316) @@ -5,8 +5,11 @@ bundle="org.codelutin.i18n.I18nBundleBridge">  <WindowEvents id="events" - onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulQueueStart,$buttonSimulQueueRemove,$buttonSimulQueueShowLog,$queueTable,$queueTableDone,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)" + onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)" onClosing="UIHelper.closeContext()" /> + <ContextDataSource id="OldSimulationName" context="current" source="OldSimulationName"/> <ContextDataSource id="SimulationFilterModel" context="current" source="SimulationFilterModel"/> @@ -39,7 +42,8 @@ <xpanel xml="simulator/Export.xml"/> <xpanel xml="simulator/ResultChoice.xml"/> <xpanel xml="simulator/AdvancedParams.xml"/> - <xpanel xml="simulator/Queue.xml"/> + <Queue id="simulQueue" name="isisfish.queue.title"/> + </tabbedPane> <xpanel constraints="statusBar" xml="StatusBar.xml"/>

1 0

r1315 - in trunk/isis-fish/src/resources: . oldmappings oldmappings/IsisFish oldmappings/IsisFish/0 oldmappings/IsisFish/0/fr oldmappings/IsisFish/0/fr/ifremer oldmappings/IsisFish/0/fr/ifremer/isisfish oldmappings/IsisFish/0/fr/ifremer/isisfish/entities oldmappings/IsisFish/3.2 oldmappings/IsisFish/3.2/fr oldmappings/IsisFish/3.2/fr/ifremer oldmappings/IsisFish/3.2/fr/ifremer/isisfish oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities
by bpoussin＠users.labs.libre-entreprise.org 29 Aug '08

29 Aug '08

Author: bpoussin Date: 2008-08-29 15:39:43 +0000 (Fri, 29 Aug 2008) New Revision: 1315 Added: trunk/isis-fish/src/resources/oldmappings/ trunk/isis-fish/src/resources/oldmappings/IsisFish/ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml Log: ajout des oldmappings v0 et v3.2 Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ActiveRuleImpl" table="activeRule" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.ActiveRule" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="activeRuleDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="activeRuleDate" node="activeRuleDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="param" type="text" access="field" column="param" node="param"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.CellImpl" table="cell" node="fr.ifremer.isisfish.entities.CellImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Cell" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="latitude" type="float" access="field" column="latitude" node="latitude"/> + <property name="longitude" type="float" access="field" column="longitude" node="longitude"/> + <property name="land" type="boolean" access="field" column="land" node="land"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" table="effortDescription" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.EffortDescription" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="fishingOperation" type="int" access="field" column="fishingOperation" node="fishingOperation"/> + <property name="fishingOperationDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="fishingOperationDuration" node="fishingOperationDuration"/> + <property name="gearsNumberPerOperation" type="int" access="field" column="gearsNumberPerOperation" node="gearsNumberPerOperation"/> + <property name="crewSize" type="int" access="field" column="crewSize" node="crewSize"/> + <property name="unitCostOfFishing" type="double" access="field" column="unitCostOfFishing" node="unitCostOfFishing"/> + <property name="fixedCrewSalary" type="double" access="field" column="fixedCrewSalary" node="fixedCrewSalary"/> + <property name="crewShareRate" type="double" access="field" column="crewShareRate" node="crewShareRate"/> + <property name="crewFoodCost" type="double" access="field" column="crewFoodCost" node="crewFoodCost"/> + <property name="repairAndMaintenanceGearCost" type="double" access="field" column="repairAndMaintenanceGearCost" node="repairAndMaintenanceGearCost"/> + <property name="otherRunningCost" type="double" access="field" column="otherRunningCost" node="otherRunningCost"/> + <property name="landingCosts" type="double" access="field" column="landingCosts" node="landingCosts"/> + <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false"/> + <many-to-one name="possibleMetiers" class="fr.ifremer.isisfish.entities.MetierImpl" column="possibleMetiers" node="possibleMetiers/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.EquationImpl" table="equation" node="fr.ifremer.isisfish.entities.EquationImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Equation" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="content" type="text" access="field" column="content" node="content"/> + <property name="category" type="text" access="field" column="category" node="category"/> + <property name="language" type="text" access="field" column="language" node="language"/> + <property name="javaInterface" type="java.lang.Class" access="field" column="javaInterface" node="javaInterface"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.FisheryRegionImpl" table="fisheryRegion" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.FisheryRegion" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="minLongitude" type="float" access="field" column="minLongitude" node="minLongitude"/> + <property name="maxLongitude" type="float" access="field" column="maxLongitude" node="maxLongitude"/> + <property name="minLatitude" type="float" access="field" column="minLatitude" node="minLatitude"/> + <property name="maxLatitude" type="float" access="field" column="maxLatitude" node="maxLatitude"/> + <property name="cellLengthLongitude" type="float" access="field" column="cellLengthLongitude" node="cellLengthLongitude"/> + <property name="cellLengthLatitude" type="float" access="field" column="cellLengthLatitude" node="cellLengthLatitude"/> + <property name="mapFiles" type="text" access="field" column="mapFiles" node="mapFiles"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.GearImpl" table="gear" node="fr.ifremer.isisfish.entities.GearImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Gear" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="effortUnit" type="text" access="field" column="effortUnit" node="effortUnit"/> + <property name="standardisationFactor" type="double" access="field" column="standardisationFactor" node="standardisationFactor"/> + <property name="parameterName" type="text" access="field" column="parameterName" node="parameterName"/> + <property name="cost" type="double" access="field" column="cost" node="cost"/> + <property name="possibleValue" type="fr.ifremer.isisfish.types.hibernate.RangeOfValuesType" access="field" column="possibleValue" node="possibleValue"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="populationSelectivity" lazy="true" cascade="all,delete-orphan" node="populationSelectivity" embed-xml="true"> + <key column="gear"/> + <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.MetierImpl" table="metier" node="fr.ifremer.isisfish.entities.MetierImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Metier" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="gearParameterValue" type="text" access="field" column="gearParameterValue" node="gearParameterValue"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="capturableSpeciesComment" type="text" access="field" column="capturableSpeciesComment" node="capturableSpeciesComment"/> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false"/> + <bag name="setOfVesselsEffortDescription" inverse="true" lazy="true" cascade="all,delete-orphan" node="setOfVesselsEffortDescription" embed-xml="true"> + <key column="possibleMetiers"/> + <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="metierSeasonInfo" order-by="firstMonth, lastMonth" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="true"> + <key column="metier"/> + <one-to-many class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <union-subclass name="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="metierSeasonInfo" node="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.MetierSeasonInfo" > +  + <property name="seasonZoneComment" type="text" access="field" column="seasonZoneComment" node="seasonZoneComment"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="speciesTargetSpecies" lazy="true" cascade="all,delete-orphan" node="speciesTargetSpecies" embed-xml="true"> + <key column="metierSeasonInfo"/> + <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="metier" class="fr.ifremer.isisfish.entities.MetierImpl" column="metier" node="metier/@topiaId" embed-xml="false"/> + <bag name="zone" table="metierseasoninfo_zone" lazy="true" node="zone" embed-xml="true"> + <key column="metierSeasonInfo"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="zone" node="topiaId"/> + </bag> + </union-subclass> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PopulationGroupImpl" table="populationGroup" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.PopulationGroup" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="id" type="int" access="field" column="id" node="id"/> + <property name="reproductionRate" type="double" access="field" column="reproductionRate" node="reproductionRate"/> + <property name="age" type="double" access="field" column="age" node="age"/> + <property name="minLength" type="double" access="field" column="minLength" node="minLength"/> + <property name="maxLength" type="double" access="field" column="maxLength" node="maxLength"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PopulationImpl" table="population" node="fr.ifremer.isisfish.entities.PopulationImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Population" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="geographicId" type="text" access="field" column="geographicId" node="geographicId"/> + <property name="plusGroup" type="boolean" access="field" column="plusGroup" node="plusGroup"/> + <many-to-one name="growth" class="fr.ifremer.isisfish.entities.EquationImpl" column="growth" cascade="delete" node="growth/@topiaId" embed-xml="false"/> + <many-to-one name="growthReverse" class="fr.ifremer.isisfish.entities.EquationImpl" column="growthReverse" cascade="delete" node="growthReverse/@topiaId" embed-xml="false"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="meanWeight" class="fr.ifremer.isisfish.entities.EquationImpl" column="meanWeight" cascade="delete" node="meanWeight/@topiaId" embed-xml="false"/> + <many-to-one name="price" class="fr.ifremer.isisfish.entities.EquationImpl" column="price" cascade="delete" node="price/@topiaId" embed-xml="false"/> + <many-to-one name="naturalDeathRate" class="fr.ifremer.isisfish.entities.EquationImpl" column="naturalDeathRate" cascade="delete" node="naturalDeathRate/@topiaId" embed-xml="false"/> + <property name="caractBioComment" type="text" access="field" column="caractBioComment" node="caractBioComment"/> + <many-to-one name="reproductionEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="reproductionEquation" cascade="delete" node="reproductionEquation/@topiaId" embed-xml="false"/> + <property name="monthGapBetweenReproRecrutement" type="int" access="field" column="monthGapBetweenReproRecrutement" node="monthGapBetweenReproRecrutement"/> + <property name="recruitmentDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="recruitmentDistribution_name"/> + <column name="recruitmentDistribution_dim"/> + <column name="recruitmentDistribution_dimNames"/> + <column name="recruitmentDistribution_semantics"/> + <column name="recruitmentDistribution_data"/> + </property> + <property name="recruitmentComment" type="text" access="field" column="recruitmentComment" node="recruitmentComment"/> + <property name="zonesComment" type="text" access="field" column="zonesComment" node="zonesComment"/> + <property name="seasonsComment" type="text" access="field" column="seasonsComment" node="seasonsComment"/> + <property name="capturabilityComment" type="text" access="field" column="capturabilityComment" node="capturabilityComment"/> + <property name="migrationComment" type="text" access="field" column="migrationComment" node="migrationComment"/> + <property name="mappingZoneReproZoneRecru" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="mappingZoneReproZoneRecru_name"/> + <column name="mappingZoneReproZoneRecru_dim"/> + <column name="mappingZoneReproZoneRecru_dimNames"/> + <column name="mappingZoneReproZoneRecru_semantics"/> + <column name="mappingZoneReproZoneRecru_data"/> + </property> + <property name="capturability" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="capturability_name"/> + <column name="capturability_dim"/> + <column name="capturability_dimNames"/> + <column name="capturability_semantics"/> + <column name="capturability_data"/> + </property> + <bag name="gearSelectivity" inverse="true" lazy="true" cascade="all,delete-orphan" node="gearSelectivity" embed-xml="true"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="populationGroup" order-by="id" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="true"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationGroupImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="populationSeasonInfo" order-by="firstMonth, lastMonth" inverse="true" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="true"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false"/> + <bag name="reproductionZone" table="population_reproductionzone" lazy="true" node="reproductionZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="reproductionZone" node="topiaId"/> + </bag> + <bag name="populationZone" table="population_populationzone" lazy="true" node="populationZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="populationZone" node="topiaId"/> + </bag> + <bag name="recruitmentZone" table="population_recruitmentzone" lazy="true" node="recruitmentZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="recruitmentZone" node="topiaId"/> + </bag> + <many-to-one name="maturityGroup" class="fr.ifremer.isisfish.entities.PopulationGroupImpl" column="maturityGroup" unique="true" node="maturityGroup/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <union-subclass name="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="populationSeasonInfo" node="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.PopulationSeasonInfo" > +  + <property name="reproductionDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="reproductionDistribution_name"/> + <column name="reproductionDistribution_dim"/> + <column name="reproductionDistribution_dimNames"/> + <column name="reproductionDistribution_semantics"/> + <column name="reproductionDistribution_data"/> + </property> + <property name="groupChange" type="boolean" access="field" column="groupChange" node="groupChange"/> + <property name="simpleLengthChangeMatrix" type="boolean" access="field" column="simpleLengthChangeMatrix" node="simpleLengthChangeMatrix"/> + <property name="lengthChangeMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="lengthChangeMatrix_name"/> + <column name="lengthChangeMatrix_dim"/> + <column name="lengthChangeMatrix_dimNames"/> + <column name="lengthChangeMatrix_semantics"/> + <column name="lengthChangeMatrix_data"/> + </property> + <property name="reproduction" type="boolean" access="field" column="reproduction" node="reproduction"/> + <property name="useEquationMigration" type="boolean" access="field" column="useEquationMigration" node="useEquationMigration"/> + <property name="migrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="migrationMatrix_name"/> + <column name="migrationMatrix_dim"/> + <column name="migrationMatrix_dimNames"/> + <column name="migrationMatrix_semantics"/> + <column name="migrationMatrix_data"/> + </property> + <property name="emigrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="emigrationMatrix_name"/> + <column name="emigrationMatrix_dim"/> + <column name="emigrationMatrix_dimNames"/> + <column name="emigrationMatrix_semantics"/> + <column name="emigrationMatrix_data"/> + </property> + <property name="immigrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="immigrationMatrix_name"/> + <column name="immigrationMatrix_dim"/> + <column name="immigrationMatrix_dimNames"/> + <column name="immigrationMatrix_semantics"/> + <column name="immigrationMatrix_data"/> + </property> + <many-to-one name="migrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="migrationEquation" cascade="delete" node="migrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="emigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="emigrationEquation" cascade="delete" node="emigrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="immigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="immigrationEquation" cascade="delete" node="immigrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </union-subclass> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PortImpl" table="port" node="fr.ifremer.isisfish.entities.PortImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Port" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="cell" class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="cell/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ResultImpl" table="result" node="fr.ifremer.isisfish.entities.ResultImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Result" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="resultDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="resultDate" node="resultDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="matrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="matrix_name"/> + <column name="matrix_dim"/> + <column name="matrix_dimNames"/> + <column name="matrix_semantics"/> + <column name="matrix_data"/> + </property> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SeasonImpl" table="season" node="fr.ifremer.isisfish.entities.SeasonImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Season" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="firstMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="firstMonth" node="firstMonth"/> + <property name="lastMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="lastMonth" node="lastMonth"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SelectivityImpl" table="selectivity" node="fr.ifremer.isisfish.entities.SelectivityImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Selectivity" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <many-to-one name="equation" class="fr.ifremer.isisfish.entities.EquationImpl" column="equation" cascade="delete" node="equation/@topiaId" embed-xml="false"/> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" table="setOfVessels" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.SetOfVessels" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="numberOfVessels" type="int" access="field" column="numberOfVessels" node="numberOfVessels"/> + <property name="fixedCosts" type="double" access="field" column="fixedCosts" node="fixedCosts"/> + <property name="vesselCosts" type="double" access="field" column="vesselCosts" node="vesselCosts"/> + <property name="capitalDeprecation" type="double" access="field" column="capitalDeprecation" node="capitalDeprecation"/> + <property name="interestCost" type="double" access="field" column="interestCost" node="interestCost"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="port" class="fr.ifremer.isisfish.entities.PortImpl" column="port" node="port/@topiaId" embed-xml="false"/> + <bag name="possibleMetiers" lazy="true" cascade="all,delete-orphan" node="possibleMetiers" embed-xml="true"> + <key column="setOfVessels"/> + <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="vesselType" class="fr.ifremer.isisfish.entities.VesselTypeImpl" column="vesselType" node="vesselType/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SpeciesImpl" table="species" node="fr.ifremer.isisfish.entities.SpeciesImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Species" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="scientificName" type="text" access="field" column="scientificName" node="scientificName"/> + <property name="codeRubbin" type="text" access="field" column="codeRubbin" node="codeRubbin"/> + <property name="codeCEE" type="int" access="field" column="codeCEE" node="codeCEE"/> + <property name="ageGroupType" type="boolean" access="field" column="ageGroupType" node="ageGroupType"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="metierSeasonInfoTargetSpecies" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfoTargetSpecies" embed-xml="true"> + <key column="species"/> + <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="population" inverse="true" lazy="true" cascade="all,delete-orphan" node="population" embed-xml="true"> + <key column="species"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.StrategyImpl" table="strategy" node="fr.ifremer.isisfish.entities.StrategyImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Strategy" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="proportionSetOfVessels" type="double" access="field" column="proportionSetOfVessels" node="proportionSetOfVessels"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false"/> + <bag name="strategyMonthInfo" order-by="month" inverse="true" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="true"> + <key column="strategy"/> + <one-to-many class="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" table="strategyMonthInfo" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.StrategyMonthInfo" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="month" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="month" node="month"/> + <property name="minInactivityDays" type="int" access="field" column="minInactivityDays" node="minInactivityDays"/> + <property name="numberOfTrips" type="int" access="field" column="numberOfTrips" node="numberOfTrips"/> + <property name="proportionMetier" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="proportionMetier_name"/> + <column name="proportionMetier_dim"/> + <column name="proportionMetier_dimNames"/> + <column name="proportionMetier_semantics"/> + <column name="proportionMetier_data"/> + </property> + <many-to-one name="tripType" class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="tripType/@topiaId" embed-xml="false"/> + <many-to-one name="strategy" class="fr.ifremer.isisfish.entities.StrategyImpl" column="strategy" node="strategy/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" table="targetSpecies" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.TargetSpecies" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <many-to-one name="targetFactorEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="targetFactorEquation" cascade="delete" node="targetFactorEquation/@topiaId" embed-xml="false"/> + <property name="primaryCatch" type="boolean" access="field" column="primaryCatch" node="primaryCatch"/> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false"/> + <many-to-one name="metierSeasonInfo" class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" column="metierSeasonInfo" node="metierSeasonInfo/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.TripTypeImpl" table="tripType" node="fr.ifremer.isisfish.entities.TripTypeImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.TripType" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="tripDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="tripDuration" node="tripDuration"/> + <property name="minTimeBetweenTrip" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="minTimeBetweenTrip" node="minTimeBetweenTrip"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.VesselTypeImpl" table="vesselType" node="fr.ifremer.isisfish.entities.VesselTypeImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.VesselType" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="length" type="int" access="field" column="length" node="length"/> + <property name="speed" type="double" access="field" column="speed" node="speed"/> + <property name="maxTripDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="maxTripDuration" node="maxTripDuration"/> + <property name="activityRange" type="double" access="field" column="activityRange" node="activityRange"/> + <property name="minCrewSize" type="int" access="field" column="minCrewSize" node="minCrewSize"/> + <property name="unitFuelCostOfTravel" type="double" access="field" column="unitFuelCostOfTravel" node="unitFuelCostOfTravel"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="tripType" table="triptype_vesseltype" lazy="true" node="tripType" embed-xml="true"> + <key column="vesselType"/> + <many-to-many class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ZoneImpl" table="zone" node="fr.ifremer.isisfish.entities.ZoneImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Zone" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="cell" table="cell_zone" lazy="true" node="cell" embed-xml="true"> + <key column="zone"/> + <many-to-many class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ActiveRuleImpl" table="activeRule" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.ActiveRule" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="activeRuleDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="activeRuleDate" node="activeRuleDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="param" type="text" access="field" column="param" node="param"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.CellImpl" table="cell" node="fr.ifremer.isisfish.entities.CellImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Cell" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="latitude" type="float" access="field" column="latitude" node="latitude"/> + <property name="longitude" type="float" access="field" column="longitude" node="longitude"/> + <property name="land" type="boolean" access="field" column="land" node="land"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" table="effortDescription" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.EffortDescription" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="fishingOperation" type="int" access="field" column="fishingOperation" node="fishingOperation"/> + <property name="fishingOperationDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="fishingOperationDuration" node="fishingOperationDuration"/> + <property name="gearsNumberPerOperation" type="int" access="field" column="gearsNumberPerOperation" node="gearsNumberPerOperation"/> + <property name="crewSize" type="int" access="field" column="crewSize" node="crewSize"/> + <property name="unitCostOfFishing" type="double" access="field" column="unitCostOfFishing" node="unitCostOfFishing"/> + <property name="fixedCrewSalary" type="double" access="field" column="fixedCrewSalary" node="fixedCrewSalary"/> + <property name="crewShareRate" type="double" access="field" column="crewShareRate" node="crewShareRate"/> + <property name="crewFoodCost" type="double" access="field" column="crewFoodCost" node="crewFoodCost"/> + <property name="repairAndMaintenanceGearCost" type="double" access="field" column="repairAndMaintenanceGearCost" node="repairAndMaintenanceGearCost"/> + <property name="otherRunningCost" type="double" access="field" column="otherRunningCost" node="otherRunningCost"/> + <property name="landingCosts" type="double" access="field" column="landingCosts" node="landingCosts"/> + <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false"/> + <many-to-one name="possibleMetiers" class="fr.ifremer.isisfish.entities.MetierImpl" column="possibleMetiers" node="possibleMetiers/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.EquationImpl" table="equation" node="fr.ifremer.isisfish.entities.EquationImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Equation" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="content" type="text" access="field" column="content" node="content"/> + <property name="category" type="text" access="field" column="category" node="category"/> + <property name="language" type="text" access="field" column="language" node="language"/> + <property name="javaInterface" type="java.lang.Class" access="field" column="javaInterface" node="javaInterface"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.FisheryRegionImpl" table="fisheryRegion" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.FisheryRegion" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="minLongitude" type="float" access="field" column="minLongitude" node="minLongitude"/> + <property name="maxLongitude" type="float" access="field" column="maxLongitude" node="maxLongitude"/> + <property name="minLatitude" type="float" access="field" column="minLatitude" node="minLatitude"/> + <property name="maxLatitude" type="float" access="field" column="maxLatitude" node="maxLatitude"/> + <property name="cellLengthLongitude" type="float" access="field" column="cellLengthLongitude" node="cellLengthLongitude"/> + <property name="cellLengthLatitude" type="float" access="field" column="cellLengthLatitude" node="cellLengthLatitude"/> + <property name="mapFiles" type="text" access="field" column="mapFiles" node="mapFiles"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.GearImpl" table="gear" node="fr.ifremer.isisfish.entities.GearImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Gear" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="effortUnit" type="text" access="field" column="effortUnit" node="effortUnit"/> + <property name="standardisationFactor" type="double" access="field" column="standardisationFactor" node="standardisationFactor"/> + <property name="parameterName" type="text" access="field" column="parameterName" node="parameterName"/> + <property name="cost" type="double" access="field" column="cost" node="cost"/> + <property name="possibleValue" type="fr.ifremer.isisfish.types.hibernate.RangeOfValuesType" access="field" column="possibleValue" node="possibleValue"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="populationSelectivity" lazy="true" cascade="all,delete-orphan" node="populationSelectivity" embed-xml="true"> + <key column="gear"/> + <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.MetierImpl" table="metier" node="fr.ifremer.isisfish.entities.MetierImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Metier" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="gearParameterValue" type="text" access="field" column="gearParameterValue" node="gearParameterValue"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="capturableSpeciesComment" type="text" access="field" column="capturableSpeciesComment" node="capturableSpeciesComment"/> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false"/> + <bag name="setOfVesselsEffortDescription" inverse="true" lazy="true" cascade="all,delete-orphan" node="setOfVesselsEffortDescription" embed-xml="true"> + <key column="possibleMetiers"/> + <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="metierSeasonInfo" order-by="firstMonth, lastMonth" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="true"> + <key column="metier"/> + <one-to-many class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <union-subclass name="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="metierSeasonInfo" node="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.MetierSeasonInfo" > +  + <property name="seasonZoneComment" type="text" access="field" column="seasonZoneComment" node="seasonZoneComment"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="speciesTargetSpecies" lazy="true" cascade="all,delete-orphan" node="speciesTargetSpecies" embed-xml="true"> + <key column="metierSeasonInfo"/> + <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="metier" class="fr.ifremer.isisfish.entities.MetierImpl" column="metier" node="metier/@topiaId" embed-xml="false"/> + <bag name="zone" table="metierseasoninfo_zone" lazy="true" node="zone" embed-xml="true"> + <key column="metierSeasonInfo"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="zone" node="topiaId"/> + </bag> + </union-subclass> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PopulationGroupImpl" table="populationGroup" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.PopulationGroup" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="id" type="int" access="field" column="id" node="id"/> + <property name="reproductionRate" type="double" access="field" column="reproductionRate" node="reproductionRate"/> + <property name="age" type="double" access="field" column="age" node="age"/> + <property name="minLength" type="double" access="field" column="minLength" node="minLength"/> + <property name="maxLength" type="double" access="field" column="maxLength" node="maxLength"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PopulationImpl" table="population" node="fr.ifremer.isisfish.entities.PopulationImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Population" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="geographicId" type="text" access="field" column="geographicId" node="geographicId"/> + <property name="plusGroup" type="boolean" access="field" column="plusGroup" node="plusGroup"/> + <many-to-one name="growth" class="fr.ifremer.isisfish.entities.EquationImpl" column="growth" cascade="delete" node="growth/@topiaId" embed-xml="false"/> + <many-to-one name="growthReverse" class="fr.ifremer.isisfish.entities.EquationImpl" column="growthReverse" cascade="delete" node="growthReverse/@topiaId" embed-xml="false"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="meanWeight" class="fr.ifremer.isisfish.entities.EquationImpl" column="meanWeight" cascade="delete" node="meanWeight/@topiaId" embed-xml="false"/> + <many-to-one name="price" class="fr.ifremer.isisfish.entities.EquationImpl" column="price" cascade="delete" node="price/@topiaId" embed-xml="false"/> + <many-to-one name="naturalDeathRate" class="fr.ifremer.isisfish.entities.EquationImpl" column="naturalDeathRate" cascade="delete" node="naturalDeathRate/@topiaId" embed-xml="false"/> + <property name="caractBioComment" type="text" access="field" column="caractBioComment" node="caractBioComment"/> + <many-to-one name="reproductionEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="reproductionEquation" cascade="delete" node="reproductionEquation/@topiaId" embed-xml="false"/> + <property name="monthGapBetweenReproRecrutement" type="int" access="field" column="monthGapBetweenReproRecrutement" node="monthGapBetweenReproRecrutement"/> + <property name="recruitmentDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="recruitmentDistribution_name"/> + <column name="recruitmentDistribution_dim"/> + <column name="recruitmentDistribution_dimNames"/> + <column name="recruitmentDistribution_semantics"/> + <column name="recruitmentDistribution_data"/> + </property> + <property name="recruitmentComment" type="text" access="field" column="recruitmentComment" node="recruitmentComment"/> + <property name="zonesComment" type="text" access="field" column="zonesComment" node="zonesComment"/> + <property name="seasonsComment" type="text" access="field" column="seasonsComment" node="seasonsComment"/> + <property name="capturabilityComment" type="text" access="field" column="capturabilityComment" node="capturabilityComment"/> + <property name="migrationComment" type="text" access="field" column="migrationComment" node="migrationComment"/> + <property name="mappingZoneReproZoneRecru" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="mappingZoneReproZoneRecru_name"/> + <column name="mappingZoneReproZoneRecru_dim"/> + <column name="mappingZoneReproZoneRecru_dimNames"/> + <column name="mappingZoneReproZoneRecru_semantics"/> + <column name="mappingZoneReproZoneRecru_data"/> + </property> + <property name="capturability" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="capturability_name"/> + <column name="capturability_dim"/> + <column name="capturability_dimNames"/> + <column name="capturability_semantics"/> + <column name="capturability_data"/> + </property> + <bag name="gearSelectivity" inverse="true" lazy="true" cascade="all,delete-orphan" node="gearSelectivity" embed-xml="true"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="populationGroup" order-by="id" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="true"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationGroupImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="populationSeasonInfo" order-by="firstMonth, lastMonth" inverse="true" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="true"> + <key column="population"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false"/> + <bag name="reproductionZone" table="population_reproductionzone" lazy="true" node="reproductionZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="reproductionZone" node="topiaId"/> + </bag> + <bag name="populationZone" table="population_populationzone" lazy="true" node="populationZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="populationZone" node="topiaId"/> + </bag> + <bag name="recruitmentZone" table="population_recruitmentzone" lazy="true" node="recruitmentZone" embed-xml="true"> + <key column="population"/> + <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="recruitmentZone" node="topiaId"/> + </bag> + <many-to-one name="maturityGroup" class="fr.ifremer.isisfish.entities.PopulationGroupImpl" column="maturityGroup" unique="true" node="maturityGroup/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <union-subclass name="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="populationSeasonInfo" node="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.PopulationSeasonInfo" > +  + <property name="reproductionDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="reproductionDistribution_name"/> + <column name="reproductionDistribution_dim"/> + <column name="reproductionDistribution_dimNames"/> + <column name="reproductionDistribution_semantics"/> + <column name="reproductionDistribution_data"/> + </property> + <property name="groupChange" type="boolean" access="field" column="groupChange" node="groupChange"/> + <property name="simpleLengthChangeMatrix" type="boolean" access="field" column="simpleLengthChangeMatrix" node="simpleLengthChangeMatrix"/> + <property name="lengthChangeMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="lengthChangeMatrix_name"/> + <column name="lengthChangeMatrix_dim"/> + <column name="lengthChangeMatrix_dimNames"/> + <column name="lengthChangeMatrix_semantics"/> + <column name="lengthChangeMatrix_data"/> + </property> + <property name="reproduction" type="boolean" access="field" column="reproduction" node="reproduction"/> + <property name="useEquationMigration" type="boolean" access="field" column="useEquationMigration" node="useEquationMigration"/> + <property name="migrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="migrationMatrix_name"/> + <column name="migrationMatrix_dim"/> + <column name="migrationMatrix_dimNames"/> + <column name="migrationMatrix_semantics"/> + <column name="migrationMatrix_data"/> + </property> + <property name="emigrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="emigrationMatrix_name"/> + <column name="emigrationMatrix_dim"/> + <column name="emigrationMatrix_dimNames"/> + <column name="emigrationMatrix_semantics"/> + <column name="emigrationMatrix_data"/> + </property> + <property name="immigrationMatrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="immigrationMatrix_name"/> + <column name="immigrationMatrix_dim"/> + <column name="immigrationMatrix_dimNames"/> + <column name="immigrationMatrix_semantics"/> + <column name="immigrationMatrix_data"/> + </property> + <many-to-one name="migrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="migrationEquation" cascade="delete" node="migrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="emigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="emigrationEquation" cascade="delete" node="emigrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="immigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="immigrationEquation" cascade="delete" node="immigrationEquation/@topiaId" embed-xml="false"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </union-subclass> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.PortImpl" table="port" node="fr.ifremer.isisfish.entities.PortImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Port" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="cell" class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="cell/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ResultImpl" table="result" node="fr.ifremer.isisfish.entities.ResultImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Result" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="resultDate" type="fr.ifremer.isisfish.types.hibernate.DateType" access="field" column="resultDate" node="resultDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="matrix" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="matrix_name"/> + <column name="matrix_dim"/> + <column name="matrix_dimNames"/> + <column name="matrix_semantics"/> + <column name="matrix_data"/> + </property> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SeasonImpl" table="season" node="fr.ifremer.isisfish.entities.SeasonImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Season" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="firstMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="firstMonth" node="firstMonth"/> + <property name="lastMonth" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="lastMonth" node="lastMonth"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SelectivityImpl" table="selectivity" node="fr.ifremer.isisfish.entities.SelectivityImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Selectivity" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <many-to-one name="equation" class="fr.ifremer.isisfish.entities.EquationImpl" column="equation" cascade="delete" node="equation/@topiaId" embed-xml="false"/> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" table="setOfVessels" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.SetOfVessels" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="numberOfVessels" type="int" access="field" column="numberOfVessels" node="numberOfVessels"/> + <property name="fixedCosts" type="double" access="field" column="fixedCosts" node="fixedCosts"/> + <property name="vesselCosts" type="double" access="field" column="vesselCosts" node="vesselCosts"/> + <property name="capitalDeprecation" type="double" access="field" column="capitalDeprecation" node="capitalDeprecation"/> + <property name="interestCost" type="double" access="field" column="interestCost" node="interestCost"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="technicalEfficiencyEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="technicalEfficiencyEquation" cascade="delete" node="technicalEfficiencyEquation/@topiaId" embed-xml="false"/> + <many-to-one name="port" class="fr.ifremer.isisfish.entities.PortImpl" column="port" node="port/@topiaId" embed-xml="false"/> + <bag name="possibleMetiers" lazy="true" cascade="all,delete-orphan" node="possibleMetiers" embed-xml="true"> + <key column="setOfVessels"/> + <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="vesselType" class="fr.ifremer.isisfish.entities.VesselTypeImpl" column="vesselType" node="vesselType/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.SpeciesImpl" table="species" node="fr.ifremer.isisfish.entities.SpeciesImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Species" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="scientificName" type="text" access="field" column="scientificName" node="scientificName"/> + <property name="codeRubbin" type="text" access="field" column="codeRubbin" node="codeRubbin"/> + <property name="codeCEE" type="int" access="field" column="codeCEE" node="codeCEE"/> + <property name="ageGroupType" type="boolean" access="field" column="ageGroupType" node="ageGroupType"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="metierSeasonInfoTargetSpecies" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfoTargetSpecies" embed-xml="true"> + <key column="species"/> + <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="population" inverse="true" lazy="true" cascade="all,delete-orphan" node="population" embed-xml="true"> + <key column="species"/> + <one-to-many class="fr.ifremer.isisfish.entities.PopulationImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.StrategyImpl" table="strategy" node="fr.ifremer.isisfish.entities.StrategyImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Strategy" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="proportionSetOfVessels" type="double" access="field" column="proportionSetOfVessels" node="proportionSetOfVessels"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="inactivityEquationUsed" type="boolean" access="field" column="inactivityEquationUsed" node="inactivityEquationUsed"/> + <many-to-one name="inactivityEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="inactivityEquation" cascade="delete" node="inactivityEquation/@topiaId" embed-xml="false"/> + <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false"/> + <bag name="strategyMonthInfo" order-by="month" inverse="true" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="true"> + <key column="strategy"/> + <one-to-many class="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" table="strategyMonthInfo" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.StrategyMonthInfo" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="month" type="fr.ifremer.isisfish.types.hibernate.MonthType" access="field" column="month" node="month"/> + <property name="minInactivityDays" type="double" access="field" column="minInactivityDays" node="minInactivityDays"/> + <property name="numberOfTrips" type="double" access="field" column="numberOfTrips" node="numberOfTrips"/> + <property name="proportionMetier" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > + <column name="proportionMetier_name"/> + <column name="proportionMetier_dim"/> + <column name="proportionMetier_dimNames"/> + <column name="proportionMetier_semantics"/> + <column name="proportionMetier_data"/> + </property> + <many-to-one name="tripType" class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="tripType/@topiaId" embed-xml="false"/> + <many-to-one name="strategy" class="fr.ifremer.isisfish.entities.StrategyImpl" column="strategy" node="strategy/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" table="targetSpecies" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.TargetSpecies" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <many-to-one name="targetFactorEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="targetFactorEquation" cascade="delete" node="targetFactorEquation/@topiaId" embed-xml="false"/> + <property name="primaryCatch" type="boolean" access="field" column="primaryCatch" node="primaryCatch"/> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false"/> + <many-to-one name="metierSeasonInfo" class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" column="metierSeasonInfo" node="metierSeasonInfo/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.TripTypeImpl" table="tripType" node="fr.ifremer.isisfish.entities.TripTypeImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.TripType" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="tripDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="tripDuration" node="tripDuration"/> + <property name="minTimeBetweenTrip" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="minTimeBetweenTrip" node="minTimeBetweenTrip"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.VesselTypeImpl" table="vesselType" node="fr.ifremer.isisfish.entities.VesselTypeImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.VesselType" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="length" type="int" access="field" column="length" node="length"/> + <property name="speed" type="double" access="field" column="speed" node="speed"/> + <property name="maxTripDuration" type="fr.ifremer.isisfish.types.hibernate.TimeUnitType" access="field" column="maxTripDuration" node="maxTripDuration"/> + <property name="activityRange" type="double" access="field" column="activityRange" node="activityRange"/> + <property name="minCrewSize" type="int" access="field" column="minCrewSize" node="minCrewSize"/> + <property name="unitFuelCostOfTravel" type="double" access="field" column="unitFuelCostOfTravel" node="unitFuelCostOfTravel"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="tripType" table="triptype_vesseltype" lazy="true" node="tripType" embed-xml="true"> + <key column="vesselType"/> + <many-to-many class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml (rev 0) +++ trunk/isis-fish/src/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2008-08-29 15:39:43 UTC (rev 1315) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> + <class name="fr.ifremer.isisfish.entities.ZoneImpl" table="zone" node="fr.ifremer.isisfish.entities.ZoneImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Zone" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <bag name="cell" table="cell_zone" lazy="true" node="cell" embed-xml="true"> + <key column="zone"/> + <many-to-many class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="topiaId"/> + </bag> + </class> +</hibernate-mapping>

1 0