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

r3173 - isis-fish/branches/3.3.1/src/main/resources/icons
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:34:38 +0000 (Thu, 17 Mar 2011) New Revision: 3173 Log: Add new icons for group screening and rule as factor Added: isis-fish/branches/3.3.1/src/main/resources/icons/table.png isis-fish/branches/3.3.1/src/main/resources/icons/table_multiple.png Added: isis-fish/branches/3.3.1/src/main/resources/icons/table.png =================================================================== (Binary files differ) Property changes on: isis-fish/branches/3.3.1/src/main/resources/icons/table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/branches/3.3.1/src/main/resources/icons/table_multiple.png =================================================================== (Binary files differ) Property changes on: isis-fish/branches/3.3.1/src/main/resources/icons/table_multiple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r3172 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: simulator/sensitivity ui/result ui/simulator/filter ui/vcs ui/widget/filter
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:34:09 +0000 (Thu, 17 Mar 2011) New Revision: 3172 Log: Fix code style, import... Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -30,25 +30,29 @@ import java.util.Collection; import java.util.List; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.export.SensitivityExport; +import javax.swing.Box; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.JTextPane; + import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.FileUtil; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.FileUtil; -import javax.swing.*; - public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -24,7 +24,8 @@ */ package fr.ifremer.isisfish.ui.result; -import javax.swing.*; +import javax.swing.JLabel; +import javax.swing.JList; /** * InfoPanelable. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -26,6 +26,19 @@ import static org.nuiton.i18n.I18n._; +import java.awt.Dimension; +import java.awt.event.ItemEvent; +import java.beans.PropertyVetoException; +import java.io.IOException; +import java.text.ParseException; +import java.util.List; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.JInternalFrame; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.logging.SimulationLoggerUtil; import fr.ifremer.isisfish.simulator.SimulationProperties; @@ -35,17 +48,7 @@ import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.util.ErrorHelper; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import javax.swing.*; -import java.awt.*; -import java.awt.event.ItemEvent; -import java.beans.PropertyVetoException; -import java.io.IOException; -import java.text.ParseException; -import java.util.List; - /** * ResultView.java * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -27,8 +27,12 @@ import static org.nuiton.i18n.I18n._; -import javax.swing.*; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -38,6 +42,19 @@ import java.util.HashMap; import java.util.Vector; +import javax.swing.AbstractButton; +import javax.swing.Box; +import javax.swing.ButtonGroup; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; + public abstract class ResultViewUI extends JPanel implements ResultViewUICallback{ public ResultViewUI(){ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2011-03-17 10:34:09 UTC (rev 3172) @@ -71,7 +71,7 @@ if ($binding.equals("reset.enabled")) { if (comboResult != null) { $bindingSources.put("comboResult", comboResult); - this.comboResult.addItemListener((java.awt.event.ItemListener) jaxx.runtime.Util.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); + this.comboResult.addItemListener((java.awt.event.ItemListener) jaxx.runtime.JAXXUtil.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); } processDataBinding($binding); } else super.applyDataBinding($binding); @@ -80,7 +80,7 @@ public void removeDataBinding(String $binding) { if ($binding.equals("reset.enabled")) { if (comboResult != null) { - ((jaxx.runtime.swing.JAXXComboBox) $bindingSources.remove("comboResult")).removeItemListener((java.awt.event.ItemListener) jaxx.runtime.Util.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); + ((jaxx.runtime.swing.JAXXComboBox) $bindingSources.remove("comboResult")).removeItemListener((java.awt.event.ItemListener) jaxx.runtime.JAXXUtil.getEventListener(java.awt.event.ItemListener.class, this, "$pr$u10")); } } else super.removeDataBinding($binding); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -23,11 +23,15 @@ #L% --> <fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI> - <script> - import fr.ifremer.isisfish.simulator.SimulationMeta; - - protected static java.text.SimpleDateFormat simpleDateFormat = - new java.text.SimpleDateFormat("dd/MM/yyyy"); +<import> + fr.ifremer.isisfish.simulator.SimulationMeta + fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI + org.jdesktop.swingx.JXDatePicker + + java.text.SimpleDateFormat +</import> +<script> + protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); public SimulationFilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { super(dialog); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -26,7 +26,6 @@ <script><![CDATA[ // FIXME a refaire -// import static org.nuiton.vcs.VCSState.*; // import org.nuiton.vcs.VCSState; // protected org.nuiton.vcs.VCSRepositoryState model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -23,19 +23,22 @@ #L% --> <JDialog> - <script> - import jaxx.runtime.JAXXObject; - import javax.swing.text.html.HTMLEditorKit; - import javax.swing.text.html.HTMLDocument; - import javax.swing.event.HyperlinkListener; - import javax.swing.text.html.HTMLFrameHyperlinkEvent; - import javax.swing.event.HyperlinkEvent; - import java.io.PrintWriter; - import java.io.StringWriter; + <import> + jaxx.runtime.JAXXObject + javax.swing.text.html.HTMLEditorKit + javax.swing.text.html.HTMLDocument + javax.swing.event.HyperlinkListener + javax.swing.text.html.HTMLFrameHyperlinkEvent + javax.swing.event.HyperlinkEvent + java.io.PrintWriter + java.io.StringWriter - import org.nuiton.widget.DatePicker; - import org.nuiton.widget.InvalidDateException; - + fr.ifremer.isisfish.ui.widget.filter.FilterModel + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel + fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI + java.util.List + </import> + <script> /** filter model */ protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-17 10:33:07 UTC (rev 3171) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-17 10:34:09 UTC (rev 3172) @@ -23,18 +23,20 @@ #L% --> <JPanel> - <script> - import org.nuiton.widget.DatePicker; - import org.nuiton.widget.InvalidDateException; - - protected fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog; +<import> + org.jdesktop.swingx.JXDatePicker + fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI + java.text.SimpleDateFormat + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel + fr.ifremer.isisfish.ui.util.JaxxUtil +</import> +<script> + protected FilterDialogUI dialog; - protected static java.text.SimpleDateFormat simpleDateFormat = - new java.text.SimpleDateFormat("dd/MM/yyyy"); + protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); protected FilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { - this.dialog = dialog; - + this.dialog = dialog; } /** @@ -50,39 +52,29 @@ } @SuppressWarnings({"unchecked"}) public void doReset() { - fr.ifremer.isisfish.ui.util.JaxxUtil.doReset(get$objectMap()); + JaxxUtil.doReset(get$objectMap()); } protected void extractTextFieldParam(String paramKey) { JTextField field = (JTextField) getObjectById(paramKey); - fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + FilterParamModel paramModel = dialog.getParamModel(paramKey); if (paramModel.canUse(field.getText())) paramModel.extractParam(field.getText()); } protected void extractCheckBoxParam(String paramKey) { JCheckBox field = (JCheckBox) getObjectById(paramKey); - fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + FilterParamModel paramModel = dialog.getParamModel(paramKey); if (field.isSelected()) paramModel.extractParam("true"); } protected void extractDateInterval(String name, String paramKey, String paramKey2) { - DatePicker field = (DatePicker) getObjectById(paramKey); - DatePicker field2 = (DatePicker) getObjectById(paramKey2); - fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(name); - if (paramModel.canUse(field.getText(), field2.getText())) { - java.util.Date d0,d1; - try { - d0 = field.getDate(); - } catch (InvalidDateException e) { - d0=null; - } - try { - d1 = field2.getDate(); - } catch (InvalidDateException e) { - d1=null; - } - paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); - } + JXDatePicker field = (JXDatePicker) getObjectById(paramKey); + JXDatePicker field2 = (JXDatePicker) getObjectById(paramKey2); + FilterParamModel paramModel = dialog.getParamModel(name); + java.util.Date d0,d1; + d0 = field.getDate(); + d1 = field2.getDate(); + paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); } </script> </JPanel>

1 0

r3171 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:33:07 +0000 (Thu, 17 Mar 2011) New Revision: 3171 Log: Disable migration when schema is created or restored Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:32:16 UTC (rev 3170) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:33:07 UTC (rev 3171) @@ -202,17 +202,28 @@ /** * Returns the storage. * - * Update shema if necessary. + * Storage is auto configured to perform shema migration. * * @return Returns the storage. */ public TopiaContext getStorage() { + TopiaContext topiaContext = getStorage(true); + return topiaContext; + } + + /** + * Returns the storage. + * + * @param performMigration if {@code true} perform migration + * @return Returns the storage. + */ + public TopiaContext getStorage(boolean performMigration) { if (storage == null || storage.isClosed()) { log.info("Create new storage for " + getName()); try { // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, getDirectory()); + IsisH2Config.addDatabaseConfig(config, getDirectory(), performMigration); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext @@ -289,7 +300,8 @@ // load data // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, rootDirDest); + // false = don't perform, schema is empty + IsisH2Config.addDatabaseConfig(config, rootDirDest, false); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext

1 0

r3170 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish test/java/fr/ifremer/isisfish/entity test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:32:16 +0000 (Thu, 17 Mar 2011) New Revision: 3170 Log: Disable migration when schema is created or restored Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Tony Chemit + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Tony Chemit, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -32,14 +32,13 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.nuiton.topia.migration.TopiaMigrationServiceImpl; +import org.nuiton.topia.migration.TopiaMigrationEngine; +import org.nuiton.topia.migration.TopiaMigrationService; -import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; -import fr.ifremer.isisfish.datastore.migration.SwingMigrationCallbackHandler; +import fr.ifremer.isisfish.datastore.migration.DatabaseMigrationClass; - /** * Isis H2 concrete Config implementation. * @@ -56,7 +55,7 @@ private static Log log = LogFactory.getLog(IsisH2Config.class); /** Set in static field to be overridden by tests. Default to swing callback. */ - protected static Class<?> databaseMigrationClass = SwingMigrationCallbackHandler.class; + protected static Class<?> databaseMigrationClass = DatabaseMigrationClass.class; protected static final String COMMON_URL = // on peut aussi utiliser mysql ou postgresql @@ -141,9 +140,10 @@ * * @param config l'objet properties dans lequel il faut ajouter les informations * @param directory le repertoire dans lequel la base de données doit se trouver + * @param performMigration if {@code true} perform migration * @return l'objet config passe en parametre */ - public static Properties addDatabaseConfig(Properties config, File directory) { + public static Properties addDatabaseConfig(Properties config, File directory, boolean performMigration) { File databasePath = getStorageDataDirectory(directory); databasePath.mkdirs(); @@ -158,11 +158,11 @@ } // migration configuration, seulement pour les fichiers, pas pour les bases memoires - config.put(TopiaMigrationServiceImpl.MIGRATION_APPLICATION_VERSION, IsisConfig.getDatabaseVersion().toString()); - config.put(TopiaMigrationServiceImpl.MIGRATION_PREVIOUS_MAPPING_DIRECTORY, "oldmappings"); - config.put(TopiaMigrationServiceImpl.MIGRATION_MODEL_NAMES, "IsisFish"); - config.put(TopiaMigrationServiceImpl.MIGRATION_CALLBACKHANDLERS, databaseMigrationClass.getName()); - config.put("topia.service.migration", TopiaMigrationServiceImpl.class.getName()); + config.put(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); + config.put(TopiaMigrationService.MIGRATION_CALLBACK, databaseMigrationClass.getName()); + if (!performMigration) { + config.put(TopiaMigrationService.MIGRATION_MIGRATE_ON_INIT, databaseMigrationClass.getName()); + } return config; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -202,7 +202,7 @@ if (region != null) { File file = region.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = region.getStorage().beginTransaction(); + TopiaContext tx = region.getStorage(false).beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -280,7 +280,7 @@ RegionStorage result = new RegionStorage(directory, name); try { - TopiaContext context = result.getStorage().beginTransaction(); + TopiaContext context = result.getStorage(false).beginTransaction(); context.createSchema(); FisheryRegionDAO regionDAO = IsisFishDAOHelper .getFisheryRegionDAO(context); @@ -436,7 +436,7 @@ if (result != null) { File data = result.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = result.getStorage().beginTransaction(); + TopiaContext tx = result.getStorage(false).beginTransaction(); tx.restore(data); if (newName != null) { FisheryRegion region = getFisheryRegion(tx); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -597,7 +597,7 @@ checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + name); SimulationStorage sim = getSimulation(name); File file = sim.getDataBackupFile(); - TopiaContext tx = sim.getStorage().beginTransaction(); + TopiaContext tx = sim.getStorage(false).beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -686,7 +686,7 @@ File data = result.getDataBackupFile(); // FIXME was file.exists() ? if (data.exists()) { - TopiaContext tx = result.getStorage().beginTransaction(); + TopiaContext tx = result.getStorage(false).beginTransaction(); tx.restore(data); tx.commitTransaction(); tx.closeContext(); @@ -732,10 +732,10 @@ tx.commitTransaction(); tx.closeContext(); - } catch (IOException e) { - throw new StorageException(e); - } catch (TopiaException e) { - throw new StorageException(e); + } catch (IOException ex) { + throw new StorageException("Can't extract region", ex); + } catch (TopiaException ex) { + throw new StorageException("Can't extract region", ex); } finally { if (tmpDir != null && !FileUtil.deleteRecursively(tmpDir)) { log.warn(_("isisfish.error.delete.file", tmpDir)); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -33,7 +33,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; -import fr.ifremer.isisfish.datastore.TestIsisH2Config; +import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import freemarker.cache.TemplateLoader; import freemarker.ext.beans.BeansWrapper; @@ -98,7 +98,7 @@ // install a new topia migration service callback // to not ask for user for migration during test - TestIsisH2Config.setTestMigrationCallBack(); + AutoMigrationIsisH2Config.setTestMigrationCallBack(); FileUtils.copyDirectory(new File("src/test/resources/test-database"), dirDatabase, new FileFilter() { Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -65,8 +65,8 @@ SimulationParameter parameters = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("testdao", parameters); - TopiaContext rootContext = simulation.getStorage(); + TopiaContext rootContext = simulation.getStorage(false); TopiaContext context = rootContext.beginTransaction(); context.createSchema(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 10:30:25 UTC (rev 3169) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 10:32:16 UTC (rev 3170) @@ -125,7 +125,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_1_int", params); - TopiaContext storageContext = simulation.getStorage(); + TopiaContext storageContext = simulation.getStorage(false); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(childStorageContext); @@ -225,7 +225,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_2_matrix", params); - TopiaContext storageContext = simulation.getStorage(); + TopiaContext storageContext = simulation.getStorage(false); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); PopulationSeasonInfoDAO populationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(childStorageContext);

1 0

r3169 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:30:25 +0000 (Thu, 17 Mar 2011) New Revision: 3169 Log: Update nuiton-utils (Version) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2011-03-17 10:29:39 UTC (rev 3168) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2011-03-17 10:30:25 UTC (rev 3169) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -53,6 +53,10 @@ import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.dom4j.Document; +import org.dom4j.Element; +import org.dom4j.Node; +import org.dom4j.io.SAXReader; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.math.matrix.MatrixHelper; import org.nuiton.math.matrix.MatrixND; @@ -61,11 +65,7 @@ import org.nuiton.util.ArrayUtil; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; -import org.nuiton.util.VersionNumberUtil; -import org.dom4j.Document; -import org.dom4j.Element; -import org.dom4j.Node; -import org.dom4j.io.SAXReader; +import org.nuiton.util.VersionUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -191,9 +191,9 @@ * @throws Exception */ private File convertXML(File file, String versionStart, String versionEnd) throws Exception { - if(VersionNumberUtil.greaterThan(versionStart, versionEnd)){ + if(VersionUtil.greaterThan(versionStart, versionEnd)){ throw new Exception(_("isisfish.error.import.recent.files")); - }else if(VersionNumberUtil.smallerThan(versionStart, versionEnd)){ + }else if(VersionUtil.smallerThan(versionStart, versionEnd)){ // upgrate du fichier try{ // recherche des fichiers XSL de conversion @@ -228,7 +228,7 @@ URL xsl = (URL)xslurl.get(0); result.add(xsl); String end = getVersionEnd(xsl); - if(VersionNumberUtil.equals(versionEnd, end)){ + if(VersionUtil.equals(versionEnd, end)){ return result.toArray(new URL[result.size()]); } xslurl = Resource.getURLs(".*?" + XSL_DIRECTORY + "/isis-fish-"+end+"_.*.xsl$"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java 2011-03-17 10:29:39 UTC (rev 3168) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java 2011-03-17 10:30:25 UTC (rev 3169) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, CodeLutin + * Copyright (C) 1999 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -23,7 +23,7 @@ * #L% */ /** - * Database storage migration. + * IsisFish V2 import. */ package fr.ifremer.isisfish.datastore.update;

1 0

r3168 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:29:39 +0000 (Thu, 17 Mar 2011) New Revision: 3168 Log: Fix layer initialisation (was not working if setter was called in a different order) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2011-03-17 10:28:42 UTC (rev 3167) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2011-03-17 10:29:39 UTC (rev 3168) @@ -643,6 +643,10 @@ */ public void setSelectionMode(int v) { this.selectionMode = v; + + if (activeSelectionLayer != null) { + activeSelectionLayer.setSelectionMode(v); + } } public void addSelectionLayer() {

1 0

r3167 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:28:42 +0000 (Thu, 17 Mar 2011) New Revision: 3167 Log: Use new topia migration service Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 10:28:18 UTC (rev 3166) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-17 10:28:42 UTC (rev 3167) @@ -589,28 +589,13 @@ <inputs>zargo</inputs> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <defaultPackage>fr.ifremer.isisfish</defaultPackage> -  - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer - </templates> + <extractedPackages>fr.ifremer.isisfish</extractedPackages> + <templates>org.nuiton.topia.generator.TopiaMetaTransformer</templates> </configuration> <goals> <goal>smart-generate</goal> </goals> </execution> -  </executions> <dependencies> <dependency>

1 0

r3166 - in isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore: . migration
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:28:18 +0000 (Thu, 17 Mar 2011) New Revision: 3166 Log: Use new topia migration service Added: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java Removed: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java Copied: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java (from rev 3148, isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java) =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java (rev 0) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java 2011-03-17 10:28:18 UTC (rev 3166) @@ -0,0 +1,47 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * %% + * 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, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore; + +import fr.ifremer.isisfish.datastore.migration.AutoDatabaseMigrationClass; + +/** + * Empty class used to access inherited static field. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class AutoMigrationIsisH2Config extends IsisH2Config { + + /** + * Override default migration with test one. + */ + public static void setTestMigrationCallBack() { + databaseMigrationClass = AutoDatabaseMigrationClass.class; + } +} Deleted: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java 2011-03-17 10:27:55 UTC (rev 3165) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java 2011-03-17 10:28:18 UTC (rev 3166) @@ -1,50 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin - * %% - * 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, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.datastore; - -import org.junit.Ignore; - -import fr.ifremer.isisfish.datastore.migration.TestMigrationCallbackHandler; - -/** - * Empty class used to access inherited static field. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ - at Ignore -public class TestIsisH2Config extends IsisH2Config { - - /** - * Override default migration with test one. - */ - public static void setTestMigrationCallBack() { - databaseMigrationClass = TestMigrationCallbackHandler.class; - } -} Copied: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java (from rev 3148, isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java) =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java (rev 0) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java 2011-03-17 10:28:18 UTC (rev 3166) @@ -0,0 +1,51 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * 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, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore.migration; + +import java.util.List; + +import org.nuiton.util.Version; + +/** + * Test migration callback for topia migration service. + * But for test purpose, don't ask user, always do migration. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class AutoDatabaseMigrationClass extends DatabaseMigrationClass { + + /* + * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#askUser(org.nuiton.util.Version, java.util.List) + */ + @Override + public boolean askUser(Version dbVersion, List<Version> versions) { + return true; + } +} Deleted: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java 2011-03-17 10:27:55 UTC (rev 3165) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java 2011-03-17 10:28:18 UTC (rev 3166) @@ -1,55 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 2010 Ifremer, CodeLutin - * %% - * 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, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.datastore.migration; - -import org.junit.Ignore; -import org.nuiton.topia.migration.DatabaseManager; - -/** - * Test migration callback for topia migration service. - * But for test purpose, don't ask user, always do migration. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author: chatellier $ - */ - at Ignore -public class TestMigrationCallbackHandler extends SwingMigrationCallbackHandler { - - /* - * @see org.nuiton.topia.migration.callback.MigrationCallbackHandler#doMigration(java.lang.String, java.lang.String) - */ - @Override - public MigrationChoice doMigration(DatabaseManager dbManager, - String dbVersion, String applicationVersion) { - - // test always perform migration without ask user - MigrationChoice result = migrate(dbManager, dbVersion, applicationVersion); - return result; - } -}

1 0

r3165 - isis-fish/branches/3.3.1/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:27:55 +0000 (Thu, 17 Mar 2011) New Revision: 3165 Log: Move loglevel to warn (i18n to verbose) Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-03-17 10:27:19 UTC (rev 3164) +++ isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-03-17 10:27:55 UTC (rev 3165) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2005 - 2010 Ifremer, CodeLutin +# Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -31,7 +31,7 @@ # package level log4j.logger.fr.ifremer.isisfish=INFO -log4j.logger.org.nuiton=INFO +log4j.logger.org.nuiton=WARN log4j.logger.analyseplans=INFO log4j.logger.exports=INFO log4j.logger.formules=INFO

1 0

r3164 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/datastore/migration resources
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:27:19 +0000 (Thu, 17 Mar 2011) New Revision: 3164 Log: Use new topia migration service Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java isis-fish/branches/3.3.1/src/main/resources/oldmappings/ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2011-03-17 10:27:19 UTC (rev 3164) @@ -0,0 +1,113 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore.migration; + +import static org.nuiton.i18n.I18n._; + +import java.util.List; + +import javax.swing.JOptionPane; + +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.util.Version; + +import fr.ifremer.isisfish.IsisFishDAOHelper; + +/** + * Migration callback by class for all isis database migration. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class DatabaseMigrationClass extends TopiaMigrationCallbackByClass { + + protected static final Version VERSION_32 = new Version("3.2"); + protected static final Version VERSION_33 = new Version("3.3"); + + public DatabaseMigrationClass() { + super(new MigrationResolver()); + } + + protected static class MigrationResolver implements MigrationCallBackForVersionResolver { + /* + * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersionResolver#getCallBack(org.nuiton.util.Version) + */ + @Override + public Class<? extends MigrationCallBackForVersion> getCallBack(Version version) { + Class<? extends MigrationCallBackForVersion> result = null; + + if (version.equals(VERSION_32)) { + result = MigrationV0V32.class; + } + else if (version.equals(VERSION_33)) { + result = MigrationV32V33.class; + } + return result; + } + + } + + /* + * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#getAvailableVersions() + */ + @Override + public Version[] getAvailableVersions() { + Version[] result = new Version[] { VERSION_32, VERSION_33 }; + return result; + } + + /* + * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#getApplicationVersion() + */ + @Override + public Version getApplicationVersion() { + Version appVersion = new Version(IsisFishDAOHelper.getModelVersion()); + return appVersion; + } + + /* + * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#askUser(org.nuiton.util.Version, java.util.List) + */ + @Override + public boolean askUser(Version dbVersion, List<Version> versions) { + boolean result = false; + + int answer = JOptionPane.showConfirmDialog( + null, _("isisfish.misc.databasemigration.question", dbVersion, versions.get(versions.size() - 1)), + _("isisfish.misc.databasemigration.title"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + + if (answer == JOptionPane.YES_OPTION) { + result = true; + } + + return result; + } + +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2011-03-17 10:27:19 UTC (rev 3164) @@ -0,0 +1,70 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore.migration; + +import java.util.List; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.util.Version; + +/** + * Migration between version 0 and 3.2. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MigrationV0V32 extends MigrationCallBackForVersion { + + /** + * Constructor. + * + * @param version version + * @param callBack callback + */ + public MigrationV0V32(Version version, TopiaMigrationCallbackByClass callBack) { + super(version, callBack); + } + + /* + * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) + */ + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, boolean showSql, boolean showProgression) + throws TopiaException { + queries.add("alter table SETOFVESSELS add column TECHNICALEFFICIENCYEQUATION VARCHAR(255);"); + queries.add("alter table STRATEGY add column INACTIVITYEQUATIONUSED BIT default false;"); + queries.add("alter table STRATEGY add column INACTIVITYEQUATION VARCHAR(255);"); + queries.add("alter table STRATEGYMONTHINFO alter NUMBEROFTRIPS double;"); + queries.add("alter table STRATEGYMONTHINFO alter MININACTIVITYDAYS double;"); + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2011-03-17 10:27:19 UTC (rev 3164) @@ -0,0 +1,80 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore.migration; + +import java.util.List; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.util.Version; + +/** + * Migration between version 3.2 and 3.3. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MigrationV32V33 extends MigrationCallBackForVersion { + + /** + * Constructor. + * + * @param version version + * @param callback callback + */ + public MigrationV32V33(Version version, TopiaMigrationCallbackByClass callback) { + super(version, callback); + } + + /* + * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) + */ + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, boolean showSql, boolean showProgression) + throws TopiaException { + // replace in equation + queries.add("update EQUATION set content = replace(content, 'org.codelutin.', 'org.nuiton.');"); + // replace in matrix semantics + queries.add("update POPULATION set recruitmentDistribution_semantics = replace(recruitmentDistribution_semantics, 'org.codelutin.', 'org.nuiton.') where recruitmentDistribution_semantics IS NOT null;"); + queries.add("update POPULATION set mappingZoneReproZoneRecru_semantics = replace(mappingZoneReproZoneRecru_semantics, 'org.codelutin.', 'org.nuiton.') where mappingZoneReproZoneRecru_semantics IS NOT null;"); + queries.add("update POPULATION set capturability_semantics = replace(capturability_semantics, 'org.codelutin.', 'org.nuiton.') where capturability_semantics IS NOT null;"); + queries.add("update POPULATIONSEASONINFO set reproductionDistribution_semantics = replace(reproductionDistribution_semantics, 'org.codelutin.', 'org.nuiton.') where reproductionDistribution_semantics IS NOT null;"); + queries.add("update POPULATIONSEASONINFO set lengthChangeMatrix_semantics = replace(lengthChangeMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where lengthChangeMatrix_semantics IS NOT null;"); + queries.add("update POPULATIONSEASONINFO set migrationMatrix_semantics = replace(migrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where migrationMatrix_semantics IS NOT null;"); + queries.add("update POPULATIONSEASONINFO set emigrationMatrix_semantics = replace(emigrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where emigrationMatrix_semantics IS NOT null;"); + queries.add("update POPULATIONSEASONINFO set immigrationMatrix_semantics = replace(immigrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where immigrationMatrix_semantics IS NOT null;"); + queries.add("update RESULT set matrix_semantics = replace(matrix_semantics, 'org.codelutin.', 'org.nuiton.') where matrix_semantics IS NOT null;"); + queries.add("update STRATEGYMONTHINFO set proportionMetier_semantics = replace(proportionMetier_semantics, 'org.codelutin.', 'org.nuiton.') where proportionMetier_semantics IS NOT null;"); + // add .shp default extension + queries.add("update FISHERYREGION set MAPFILES = regexp_replace(MAPFILES, '(,|$)', '.shp$1') where MAPFILES IS NOT null AND LENGTH(TRIM(MAPFILES)) > 0;"); + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2011-03-16 17:00:05 UTC (rev 3163) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2011-03-17 10:27:19 UTC (rev 3164) @@ -1,179 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 2010 Ifremer, CodeLutin - * %% - * 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, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.datastore.migration; - -import static org.nuiton.i18n.I18n._; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import javax.swing.JOptionPane; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.migration.DatabaseManager; -import org.nuiton.topia.migration.callback.MigrationCallbackHandler; -import org.nuiton.util.VersionNumberUtil; - -/** - * MigrationCallbackHandler. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class SwingMigrationCallbackHandler implements MigrationCallbackHandler { - - /** to use log facility, just put in your code: log.info("..."); */ - static private Log log = LogFactory - .getLog(SwingMigrationCallbackHandler.class); - - /* - * @see org.nuiton.topia.migration.callback.MigrationCallbackHandler#doMigration(java.lang.String, java.lang.String) - */ - @Override - public MigrationChoice doMigration(DatabaseManager dbManager, - String dbVersion, String applicationVersion) { - - int answer = JOptionPane.showConfirmDialog( - null, _("isisfish.misc.databasemigration.question", dbVersion, applicationVersion), - _("isisfish.misc.databasemigration.title"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - - MigrationChoice result = (answer == JOptionPane.YES_OPTION) ? MigrationChoice.MIGRATION - : MigrationChoice.NO_MIGRATION; - - if (result == MigrationChoice.MIGRATION) { - result = migrate(dbManager, dbVersion, applicationVersion); - } - return result; - } - - /** - * Perform real migration. - * - * @param dbManager database manager - * @param dbVersion database version - * @param applicationVersion application version - * @return {@code MigrationChoice.CUSTOM_MIGRATION} if success, {@code MigrationChoice.NO_MIGRATION} otherwise. - */ - protected MigrationChoice migrate(DatabaseManager dbManager, - String dbVersion, String applicationVersion) { - // migration manuel sans l'aide de topia-service - // tant que c pas fait on dit non - MigrationChoice result = MigrationChoice.NO_MIGRATION; - // ouverture d'une connexion direct JDBC sur la base - try { - Connection conn = dbManager.getConnection(); - try { - conn.setAutoCommit(false); - if (VersionNumberUtil.smallerThan(dbVersion, "3.2")) { - // on fait une migration vers 3.2 - migrateTo3_2(conn); - } - - // do same thing for other version - if (VersionNumberUtil.smallerThan(dbVersion, "3.3")) { - // on fait une migration vers 3.2 - migrateTo3_3(conn); - } - - // commit des modifs - conn.commit(); - // la migration a reussi, on dit que c fait - result = MigrationChoice.CUSTOM_MIGRATION; - } catch (Exception eee) { - // en cas d'erreur - log.error("Migration impossible de la base", eee); - // rollback du travail en cours - conn.rollback(); - } finally { - // close database connexion - conn.close(); - } - } catch (Exception eee) { - log.error("Error lors de la tentative de migration", eee); - } - - return result; - } - - protected void migrateTo3_2(Connection conn) throws SQLException { - if (log.isInfoEnabled()) { - log.info("Migrate to version 3.2"); - } - - //alteration du schema - // nouvelles equations dans les tables - - String[] sqls = new String[] { - "alter table SETOFVESSELS add column TECHNICALEFFICIENCYEQUATION VARCHAR(255);", - "alter table STRATEGY add column INACTIVITYEQUATIONUSED BIT default false;", - "alter table STRATEGY add column INACTIVITYEQUATION VARCHAR(255);", - "alter table STRATEGYMONTHINFO alter NUMBEROFTRIPS double;", - "alter table STRATEGYMONTHINFO alter MININACTIVITYDAYS double;" }; - for (String sql : sqls) { - log.info("try " + sql); - PreparedStatement sta = conn.prepareStatement(sql); - sta.executeUpdate(); - log.info("done " + sql); - } - } - - protected void migrateTo3_3(Connection conn) throws SQLException { - if (log.isInfoEnabled()) { - log.info("Migrate to version 3.3"); - } - - String[] sqls = new String[] { - // replace in equation - "update EQUATION set content = replace(content, 'org.codelutin.', 'org.nuiton.');", - // replace in matrix semantics - "update POPULATION set recruitmentDistribution_semantics = replace(recruitmentDistribution_semantics, 'org.codelutin.', 'org.nuiton.') where recruitmentDistribution_semantics IS NOT null;", - "update POPULATION set mappingZoneReproZoneRecru_semantics = replace(mappingZoneReproZoneRecru_semantics, 'org.codelutin.', 'org.nuiton.') where mappingZoneReproZoneRecru_semantics IS NOT null;", - "update POPULATION set capturability_semantics = replace(capturability_semantics, 'org.codelutin.', 'org.nuiton.') where capturability_semantics IS NOT null;", - "update POPULATIONSEASONINFO set reproductionDistribution_semantics = replace(reproductionDistribution_semantics, 'org.codelutin.', 'org.nuiton.') where reproductionDistribution_semantics IS NOT null;", - "update POPULATIONSEASONINFO set lengthChangeMatrix_semantics = replace(lengthChangeMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where lengthChangeMatrix_semantics IS NOT null;", - "update POPULATIONSEASONINFO set migrationMatrix_semantics = replace(migrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where migrationMatrix_semantics IS NOT null;", - "update POPULATIONSEASONINFO set emigrationMatrix_semantics = replace(emigrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where emigrationMatrix_semantics IS NOT null;", - "update POPULATIONSEASONINFO set immigrationMatrix_semantics = replace(immigrationMatrix_semantics, 'org.codelutin.', 'org.nuiton.') where immigrationMatrix_semantics IS NOT null;", - "update RESULT set matrix_semantics = replace(matrix_semantics, 'org.codelutin.', 'org.nuiton.') where matrix_semantics IS NOT null;", - "update STRATEGYMONTHINFO set proportionMetier_semantics = replace(proportionMetier_semantics, 'org.codelutin.', 'org.nuiton.') where proportionMetier_semantics IS NOT null;", - // add .shp default extension - "update FISHERYREGION set MAPFILES = regexp_replace(MAPFILES, '(,|$)', '.shp$1') where MAPFILES IS NOT null AND LENGTH(TRIM(MAPFILES)) > 0;" - }; - for (String sql : sqls) { - log.info("try " + sql); - PreparedStatement sta = conn.prepareStatement(sql); - sta.executeUpdate(); - log.info("done " + sql); - } - } - -} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2011-03-16 17:00:05 UTC (rev 3163) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2011-03-17 10:27:19 UTC (rev 3164) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, CodeLutin + * Copyright (C) 1999 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -23,7 +23,7 @@ * #L% */ /** - * IsisFish V2 import. + * Database storage migration. */ package fr.ifremer.isisfish.datastore.migration;

1 0