November 2013 - Echobase-commits - mailman.cloud.codelutin.com

r885 - tags
by tchemit＠users.forge.codelutin.com 04 Nov '13

04 Nov '13

Author: tchemit Date: 2013-11-04 08:58:46 +0100 (Mon, 04 Nov 2013) New Revision: 885 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/885 Log: [maven-release-plugin] copy for tag echobase-2.4 Added: tags/echobase-2.4/

1 0

r884 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com 04 Nov '13

04 Nov '13

Author: tchemit Date: 2013-11-04 08:58:36 +0100 (Mon, 04 Nov 2013) New Revision: 884 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/884 Log: [maven-release-plugin] prepare release echobase-2.4 Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2013-11-04 07:52:33 UTC (rev 883) +++ trunk/echobase-domain/pom.xml 2013-11-04 07:58:36 UTC (rev 884) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-11-04 07:52:33 UTC (rev 883) +++ trunk/echobase-services/pom.xml 2013-11-04 07:58:36 UTC (rev 884) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2013-11-04 07:52:33 UTC (rev 883) +++ trunk/echobase-tools/pom.xml 2013-11-04 07:58:36 UTC (rev 884) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-11-04 07:52:33 UTC (rev 883) +++ trunk/echobase-ui/pom.xml 2013-11-04 07:58:36 UTC (rev 884) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-04 07:52:33 UTC (rev 883) +++ trunk/pom.xml 2013-11-04 07:58:36 UTC (rev 884) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <modules> <module>echobase-domain</module> @@ -85,12 +85,12 @@ </developers> <scm> - <url>https://forge.codelutin.com/repositories/browse/echobase/trunk</url> + <url>https://forge.codelutin.com/repositories/browse/echobase/tags/echobase-2.4</url> <connection> - scm:svn:https://forge.codelutin.com/svn/echobase/trunk + scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.4 </connection> <developerConnection> - scm:svn:https://forge.codelutin.com/svn/echobase/trunk + scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.4 </developerConnection> </scm>

1 0

r883 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-domain/src/main/resources/i18n echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial echobase-services/src/test/java/fr/ifremer/echobase/services echobase-ui/src/m
by tchemit＠users.forge.codelutin.com 04 Nov '13

04 Nov '13

Author: tchemit Date: 2013-11-04 08:52:33 +0100 (Mon, 04 Nov 2013) New Revision: 883 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/883 Log: clean code, optimize i18n Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/src/site/rst/db.rst Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2013-11-04 07:52:33 UTC (rev 883) @@ -54,36 +54,4 @@ return (TopiaDAO<E>) getDAO(tx, type.getContract()); } -// public final void flushTransaction(TopiaContext tx, String errorMessage) { -// try { -// tx.getHibernateSession().flush(); -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException(errorMessage, e); -// } -// } - -// public boolean canUpdatePostgis(TopiaContext tx) { -// String dialect = tx.getHibernateConfiguration().getProperty(TopiaContextFactory.CONFIG_DIALECT); -// -// return DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); -// } - -// public boolean isSpatialAware(TopiaContext tx) { -// boolean result = canUpdatePostgis(tx); -// -// if (result) { -// -// // on pg db, check there is now a echobase_spatial_cell -// try { -// ((TopiaSqlSupport) tx).executeSQL("select count(*) from echobase_cell_spatial;"); -// } catch (Exception e) { -// // table not found (or other, ...) -// result = false; -// // rollback (otherwise transaction will stay dirty) -// ((TopiaTransaction) tx).rollbackTransaction(); -// } -// } -// return result; -// } - } Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2013-11-04 07:52:33 UTC (rev 883) @@ -16,8 +16,6 @@ echobase.common.importType.operation.short=Operation echobase.common.importType.resultsEsdu=Import the “ESDU” cells results echobase.common.importType.resultsEsdu.short=R ESDU -echobase.common.importType.resultsMap=Import the “map” cells results -echobase.common.importType.resultsMap.short=Map echobase.common.importType.resultsMapFish=Import the “map (fishes)” cells results echobase.common.importType.resultsMapFish.short=Map (fishes) echobase.common.importType.resultsMapOther=Import the “map (others)” cells results Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2013-11-04 07:52:33 UTC (rev 883) @@ -52,36 +52,23 @@ protected EchoBaseDbMeta dbMeta; -// private SpatialDataCache spatialCache; - public static EchoBaseServiceContext newContext( Locale locale, EchoBaseConfiguration configuration, EchoBaseDbMeta dbMeta) { -// , -// SpatialDataCache spatialCache) { return new DefaultEchoBaseServiceContext(locale, configuration, dbMeta); -// , -// spatialCache); } protected DefaultEchoBaseServiceContext(Locale locale, EchoBaseConfiguration configuration, EchoBaseDbMeta dbMeta) { -// SpatialDataCache spatialCache) { this.locale = locale; this.configuration = configuration; this.dbMeta = dbMeta; -// this.spatialCache = spatialCache; } -// @Override -// public SpatialDataCache getSpatialDataCache() { -// return spatialCache; -// } - @Override public TopiaEchoBasePersistenceContext getEchoBasePersistenceContext() { return echoBasePersistenceContext; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2013-11-04 07:52:33 UTC (rev 883) @@ -42,8 +42,6 @@ */ public interface EchoBaseServiceContext { -// SpatialDataCache getSpatialDataCache(); - TopiaEchoBasePersistenceContext getEchoBasePersistenceContext(); void setEchoBasePersistenceContext(TopiaEchoBasePersistenceContext internalPersistenceContext); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-11-04 07:52:33 UTC (rev 883) @@ -74,10 +74,6 @@ return serviceContext.getWorkgingDbUrl(); } -// protected final SpatialDataCache getSpatialDataCache() { -// return serviceContext.getSpatialDataCache(); -// } - protected final Locale getLocale() { return serviceContext.getLocale(); } @@ -138,9 +134,4 @@ return newService(ExportQueryService.class); } -// public final <E extends EchoBaseService> E getService(Class<E> serviceClass) { -// E result = serviceContext.newService(serviceClass); -// return result; -// } - } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2013-11-04 07:52:33 UTC (rev 883) @@ -117,11 +117,6 @@ // do commit getEchoBasePersistenceContext().commitTransaction(); -// // revoke spatial data memory cache -// getSpatialDataCache().onVoyageChanged( -// serviceContext.getWorkgingDbUrl(), -// configuration.getVoyageId()); - // update sql spatial data getSpatialService().updatePostgisTable(); @@ -260,36 +255,6 @@ } } -// protected <E extends TopiaEntity> E create(TopiaDAO<E> dao) { -// try { -// E result = dao.create(); -// return result; -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException("Could not create entity", e); -// } -// } - -// protected <E extends TopiaEntity> E create(TopiaDAO<E> dao, E entity) { -// try { -// E result = dao.create(entity); -// return result; -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException("Could not create entity", e); -// } -// } - -// protected <E extends TopiaEntity> E findByProperties(TopiaDAO<E> dao, -// String propertyName, -// Object value, -// Object... others) { -// try { -// E result = dao.findByProperties(propertyName, value, others); -// return result; -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException("Could not obtain query db", e); -// } -// } - protected String getImportMessage(M configuration, InputFile inputFile) { String message = l_(getLocale(), "echobase.importLabel.withFile", getImportLabel(configuration), inputFile.getFileName()); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java 2013-11-04 07:52:33 UTC (rev 883) @@ -71,10 +71,6 @@ if (ImportDbMode.REFERENTIAL != importDbMode) { -// // revoke all spatial data cache for all this db -// getSpatialDataCache().onDbChanged( -// serviceContext.getWorkgingDbUrl()); - // let's update postgis table getSpatialService().updatePostgisTable(); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2013-11-04 07:52:33 UTC (rev 883) @@ -109,64 +109,56 @@ public Set<SpatialData> getSpatialData(SpatialConfiguration model) { -// SpatialDataCache cache = getSpatialDataCache(); -// -// Set<SpatialData> result = cache.get(model); Set<SpatialData> result = null; - if (result == null) { + String voyageId = model.getVoyageId(); - String voyageId = model.getVoyageId(); + String dataMetadataId = model.getDataMetadataId(); + String cellTypeId = model.getCellTypeId(); - String dataMetadataId = model.getDataMetadataId(); - String cellTypeId = model.getCellTypeId(); + String speciesId = model.getSpeciesId(); + String echotypeId = model.getEchotypeId(); - String speciesId = model.getSpeciesId(); - String echotypeId = model.getEchotypeId(); + TopiaEchoBasePersistenceContext persistenceContext = getEchoBasePersistenceContext(); - TopiaEchoBasePersistenceContext persistenceContext = getEchoBasePersistenceContext(); + Voyage voyage = persistenceContext.getEntityById(Voyage.class, voyageId); - Voyage voyage = persistenceContext.getEntityById(Voyage.class, voyageId); + Preconditions.checkNotNull( + voyage, + "Could not find voyage with id " + voyageId); - Preconditions.checkNotNull( - voyage, - "Could not find voyage with id " + voyageId); + DataMetadata dataMetadata = + persistenceContext.getEntityById(DataMetadata.class, dataMetadataId); - DataMetadata dataMetadata = - persistenceContext.getEntityById(DataMetadata.class, dataMetadataId); + Preconditions.checkNotNull( + dataMetadata, + "Could not find dataMetadata with id " + dataMetadataId); - Preconditions.checkNotNull( - dataMetadata, - "Could not find dataMetadata with id " + dataMetadataId); + CellType cellType = + persistenceContext.getEntityById(CellType.class, cellTypeId); - CellType cellType = - persistenceContext.getEntityById(CellType.class, cellTypeId); + Preconditions.checkNotNull( + cellType, + "Could not find cellType with id " + cellTypeId); - Preconditions.checkNotNull( - cellType, - "Could not find cellType with id " + cellTypeId); + Species species = + persistenceContext.getEntityOrNullById(Species.class, speciesId); - Species species = - persistenceContext.getEntityOrNullById(Species.class, speciesId); + Echotype echotype = + persistenceContext.getEntityOrNullById(Echotype.class, echotypeId); - Echotype echotype = - persistenceContext.getEntityOrNullById(Echotype.class, echotypeId); + List<Predicate<Category>> predicates = Lists.newArrayList(); + if (species != null) { + predicates.add(newSpeciesCategoryPredicate(species)); + } + if (echotype != null) { + predicates.add(newEchotypeCategoryPredicate(echotype)); + } - List<Predicate<Category>> predicates = Lists.newArrayList(); - if (species != null) { - predicates.add(newSpeciesCategoryPredicate(species)); - } - if (echotype != null) { - predicates.add(newEchotypeCategoryPredicate(echotype)); - } + Predicate<Category> acceptPredicate = Predicates.or(predicates); - Predicate<Category> acceptPredicate = Predicates.or(predicates); + result = getSpatialData(voyage, dataMetadata, cellType, acceptPredicate); - result = getSpatialData(voyage, dataMetadata, cellType, acceptPredicate); - -// cache.put(model, result); - } - return result; } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2013-11-04 07:52:33 UTC (rev 883) @@ -191,11 +191,6 @@ return result; } -// @Override -// public SpatialDataCache getSpatialDataCache() { -// return null; -// } - @Override public Locale getLocale() { return Locale.FRANCE; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2013-11-04 07:52:33 UTC (rev 883) @@ -27,13 +27,11 @@ import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.persistence.EchoBaseEntityHelper; import fr.ifremer.echobase.persistence.JdbcConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.sql.SQLException; /** - * To create a fresh postgres database. + * To create a new fresh postgres database. * * Created on 11/3/13. * @@ -44,9 +42,6 @@ private static final long serialVersionUID = 1L; - /** Logger. */ - private static final Log log = LogFactory.getLog(CreatePostgresDb.class); - protected String login; protected String password; @@ -75,8 +70,6 @@ @Override public String execute() throws Exception { - String result = INPUT; - EchoBaseEntityHelper.checkJDBCConnection(metaJdbcConf); try { @@ -91,28 +84,20 @@ getEchoBaseSession().initWorkingDb(jdbcConf, true); addFlashMessage(_("echobase.info.workingDb.created", conf.getUrl())); - result = SUCCESS; } catch (Exception e) { -// if (log.isErrorEnabled()) { -// log.error("Could not create db", e); -// } try { //close working db if something is wrong. getEchoBaseSession().releaseWorkingDb(); } finally { metaJdbcConf = null; jdbcConf = null; -// addFieldError( -// "conf.url", -// _("echobase.error.workingDbConfiguration.couldNotCreate", -// e.getMessage())); } throw e; } - return result; + return SUCCESS; } @Override Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-04 07:52:33 UTC (rev 883) @@ -122,7 +122,6 @@ echobase.common.modificationUser=User echobase.common.moviesFile= echobase.common.name=Name -echobase.common.nbSpatialData=Number of result echobase.common.operationFile= echobase.common.operationMetadataFile= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements @@ -234,10 +233,8 @@ echobase.error.showData.voyage.required=Voyage required echobase.error.warlocation.notFound=Database .war file not found at location %s echobase.error.workingDbConfiguration.couldNotConnect=Could not connect to database (%s) -echobase.error.workingDbConfiguration.couldNotCreate=Could not create new postgres database echobase.error.workingDbConfiguration.createOnlyOnPostgresql=Database creation is only possible for *Postgresql* type echobase.error.workingDbConfiguration.description.required=Mandatory description -echobase.error.workingDbConfiguration.login.required=Mandatory login echobase.error.workingDbConfiguration.url.already.exists=A configuration with same url already exists echobase.error.workingDbConfiguration.url.required=Mandatory jdbc url echobase.header.request.result=SQL query result Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-04 07:52:33 UTC (rev 883) @@ -57,7 +57,6 @@ echobase.common.author=Auteur echobase.common.authorEmail=Courriel de l'auteur echobase.common.biometrySampleFile= -echobase.common.cellMapsFile= echobase.common.cellMapsFishFile=Fichier des cellules Cartes (Poisson) echobase.common.cellMapsOtherFile=Fichier des cellules Cartes (Autre) echobase.common.cellPositionReference=Référentiel géographique des cellules des cartes @@ -123,7 +122,6 @@ echobase.common.modificationUser=Utilisateur echobase.common.moviesFile= echobase.common.name=Nom -echobase.common.nbSpatialData=Nombre de cellules echobase.common.operationFile= echobase.common.operationMetadataFile= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements @@ -235,10 +233,8 @@ echobase.error.showData.voyage.required=La sélection d'une campagne est obligatoire echobase.error.warlocation.notFound=L'application n'a pas été trouvée à l'emplacement suivant %s echobase.error.workingDbConfiguration.couldNotConnect=Impossible de se connecter (%s) -echobase.error.workingDbConfiguration.couldNotCreate=Impossible de créer la nouvelle base postgres echobase.error.workingDbConfiguration.createOnlyOnPostgresql=La création d'une base n'est possible que pour le type *Postgresql* echobase.error.workingDbConfiguration.description.required=Description obligatoire -echobase.error.workingDbConfiguration.login.required=Login obligatoire echobase.error.workingDbConfiguration.url.already.exists=Une configuration existe déjà avec cette url echobase.error.workingDbConfiguration.url.required=Url jdbc obligatoire echobase.header.request.result=Résultat de la requête SQL Modified: trunk/src/site/rst/db.rst =================================================================== --- trunk/src/site/rst/db.rst 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/src/site/rst/db.rst 2013-11-04 07:52:33 UTC (rev 883) @@ -119,7 +119,6 @@ A noter que l'utilisateur pour se connecter à la base doit avoir des droits de création de base. - Spatialiser une base postgresql -------------------------------

1 0

r882 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/config echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb echobase-ui echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb src/site/rst
by tchemit＠users.forge.codelutin.com 04 Nov '13

04 Nov '13

Author: tchemit Date: 2013-11-04 08:45:35 +0100 (Mon, 04 Nov 2013) New Revision: 882 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/882 Log: fixes #3667: Faciliter la cr?\195?\169ation de nouvelles bases Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp trunk/src/site/rst/db.rst Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java 2013-11-04 07:45:35 UTC (rev 882) @@ -23,10 +23,10 @@ package fr.ifremer.echobase.config; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import fr.ifremer.echobase.EchoBaseDateConverter; import fr.ifremer.echobase.EchoBaseTechnicalException; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; @@ -37,6 +37,9 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -124,9 +127,26 @@ } } - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this); + public static final Comparator<EchoBaseConfigurationOption> CONFIGURATION_OPTION_COMPARATOR = new Comparator<EchoBaseConfigurationOption>() { + @Override + public int compare(EchoBaseConfigurationOption o1, EchoBaseConfigurationOption o2) { + return o1.key.compareTo(o2.key); + } + }; + + public String printConfig() { + StringBuilder builder = new StringBuilder(); + List<EchoBaseConfigurationOption> options = Lists.newArrayList(EchoBaseConfigurationOption.values()); + Collections.sort(options, CONFIGURATION_OPTION_COMPARATOR); + builder.append("Echobase configuration:"); + builder.append("\n--------------------------------------------------------------------------------\n"); + for (EchoBaseConfigurationOption option : options) { + builder.append(String.format("\n%1$-40s = %2$s", + option.getKey(), + applicationConfig.getOption(option))); + } + builder.append("\n--------------------------------------------------------------------------------"); + return builder.toString(); } public Properties getProperties() { @@ -240,8 +260,8 @@ key + "in your configuration file named echobase.properties)" ); - if (log.isInfoEnabled()) { - log.info(key + " = " + directory); + if (log.isDebugEnabled()) { + log.debug(key + " = " + directory); } try { FileUtil.createDirectoryIfNecessary(directory); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/embeddedapplication/EmbeddedApplicationService.java 2013-11-04 07:45:35 UTC (rev 882) @@ -373,8 +373,8 @@ "could not find resource " + resourcePath); try { File outputFile = new File(targetDirectory, resourceName); - if (log.isInfoEnabled()) { - log.info("Copy binary file from " + resourceName + " to " + + if (log.isDebugEnabled()) { + log.debug("Copy binary file from " + resourceName + " to " + outputFile); } OutputStream outputStream = new FileOutputStream(outputFile); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java 2013-11-04 07:45:35 UTC (rev 882) @@ -159,7 +159,8 @@ try { String sql = String.format(CREATE_DB_SQL_QUERY, dbName, jdbcConf.getLogin()); if (log.isInfoEnabled()) { - log.info("Create new postgres database: " + dbName + " with sql: " + sql); + log.info("Create new postgres database: " + dbName + + " with sql statement: " + sql); } getEchoBasePersistenceContext().getContext().getHibernateSession().doWork( new AbstractTopiaContext.SQLWork(sql) { @@ -172,9 +173,8 @@ } ); } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Can't create a new database: " + dbName, e); - } + throw new EchoBaseTechnicalException( + "Can't create a new database: " + dbName, e); } } Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-ui/pom.xml 2013-11-04 07:45:35 UTC (rev 882) @@ -134,6 +134,10 @@ <name>echobase.data.dir</name> <value>${project.build.directory}/echobase-data</value> </systemProperty> + <systemProperty> + <name>echobase.embedded</name> + <value>true</value> + </systemProperty> </systemProperties> </configuration> </plugin> @@ -149,6 +153,7 @@ <echobase.data.dir> ${project.build.directory}/echobase-data </echobase.data.dir> + <echobase.embedded>true</echobase.embedded> <JAVA_OPTS>-Xms512m -Xmx2048m -XX:MaxPermSize=256m</JAVA_OPTS> </systemProperties> </configuration> @@ -164,6 +169,7 @@ <echobase.data.dir> ${project.build.directory}/echobase-data </echobase.data.dir> + <echobase.embedded>true</echobase.embedded> <JAVA_OPTS>-Xms512m -Xmx2048m -XX:MaxPermSize=256m</JAVA_OPTS> </systemProperties> </configuration> Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2013-11-04 07:45:35 UTC (rev 882) @@ -197,6 +197,10 @@ "Could not init logger.", e); } + if (log.isInfoEnabled()) { + log.info(configuration.printConfig()); + } + // initialize internal root context TopiaContext internalRootContext = EchobaseTopiaContexts.newInternalDb( @@ -212,8 +216,6 @@ Locale.getDefault(), getConfiguration(), getDbMeta()); -// , -// getSpatialDataCache()); // init database (and create minimal admin user if required) initInternalDatabase(serviceContext); @@ -242,10 +244,6 @@ return defaultUsersCreated; } -// public SpatialDataCache getSpatialDataCache() { -// return spatialDataCache; -// } - public EchoBaseServiceContext newServiceContext(Locale locale, TopiaContext topiaInternalContext, TopiaContext topiaContext) { @@ -255,8 +253,6 @@ locale, configuration, dbMeta); -// , -// spatialDataCache); TopiaEchoBaseInternalPersistenceContext internalPersistenceContext = new TopiaEchoBaseInternalPersistenceContext(topiaInternalContext); @@ -275,8 +271,6 @@ public void close() { try { -// spatialDataCache.clear(); - if (internalRootContext != null) { // release internal db EchoBaseEntityHelper.releaseRootContext(internalRootContext); @@ -431,8 +425,7 @@ } protected void extractFiles(EchoBaseServiceContext serviceContext) throws IOException { - EmbeddedApplicationService service = - serviceContext.newService(EmbeddedApplicationService.class); + EchoBaseConfiguration configuration = serviceContext.getConfiguration(); // copy drivers Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2013-11-04 07:45:35 UTC (rev 882) @@ -95,20 +95,22 @@ } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Could not create db", e); - } +// if (log.isErrorEnabled()) { +// log.error("Could not create db", e); +// } try { //close working db if something is wrong. getEchoBaseSession().releaseWorkingDb(); } finally { metaJdbcConf = null; jdbcConf = null; - addFieldError( - "conf.url", - _("echobase.error.workingDbConfiguration.couldNotCreate", - e.getMessage())); +// addFieldError( +// "conf.url", +// _("echobase.error.workingDbConfiguration.couldNotCreate", +// e.getMessage())); } + + throw e; } return result; } @@ -120,28 +122,30 @@ addFieldError( "conf.driverType", _("echobase.error.workingDbConfiguration.createOnlyOnPostgresql")); - } - jdbcConf = JdbcConfiguration.newConfig( - getConf().getDriverType(), getConf().getUrl(), - login, password); + } else { + jdbcConf = JdbcConfiguration.newConfig( + getConf().getDriverType(), getConf().getUrl(), + login, password); - // gets the meta db configuration - metaJdbcConf = EchoBaseEntityHelper.newMetaWorkingDb(jdbcConf); + // gets the meta db configuration + metaJdbcConf = EchoBaseEntityHelper.newMetaWorkingDb(jdbcConf); - // check connection is ok - try { - EchoBaseEntityHelper.checkJDBCConnection(metaJdbcConf); - } catch (SQLException e) { - jdbcConf = null; - addFieldError( - "login", - _("echobase.error.workingDbConfiguration.couldNotConnect", - e.getMessage())); - addFieldError( - "password", - _("echobase.error.workingDbConfiguration.couldNotConnect", - e.getMessage())); + // check connection is ok + try { + EchoBaseEntityHelper.checkJDBCConnection(metaJdbcConf); + } catch (SQLException e) { + jdbcConf = null; + addFieldError( + "login", + _("echobase.error.workingDbConfiguration.couldNotConnect", + e.getMessage())); + addFieldError( + "password", + _("echobase.error.workingDbConfiguration.couldNotConnect", + e.getMessage())); + } } + } } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-04 07:45:35 UTC (rev 882) @@ -38,6 +38,7 @@ echobase.action.show.import.documentation=How to import data echobase.action.show.importDb.documentation=How to import a database echobase.action.show.showData.documentation=How to display spatial data +echobase.action.show.workingDb.documentation=How to connect to a working database echobase.action.toEnglish=English echobase.action.toFrench=French echobase.action.usingEnglish=English Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-04 07:45:35 UTC (rev 882) @@ -38,6 +38,7 @@ echobase.action.show.import.documentation=Comment importer des données echobase.action.show.importDb.documentation=Comment importer une base echobase.action.show.showData.documentation=Comment visualiser des données +echobase.action.show.workingDb.documentation=Comment se connecter à une base de travail echobase.action.toEnglish=En anglais echobase.action.toFrench=En français echobase.action.usingEnglish=Version anglaise Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2013-11-04 07:45:35 UTC (rev 882) @@ -78,6 +78,13 @@ </s:else> </legend> + <div class="cleanBoth help"> + <s:a href="%{getDocumentation('db.html', null)}" target="doc"> + <s:text name="echobase.action.show.workingDb.documentation"/> + </s:a> + </div> + + <s:select key="conf.driverType" cssStyle="font-size: 140%" label="%{getText('echobase.label.driverType')}" requiredLabel="true" list="driverTypes" disabled="%{confExists}"/> @@ -101,18 +108,16 @@ <ul id="dbeditorToolbar" class="toolbar floatRight"> <s:if test="confExists"> - <s:if test="echoBaseSession.user.admin"> - <li> - <s:submit action="createPostgresDb" theme="simple" - key="echobase.action.createPostgresDb"/> - </li> - </s:if> <li> <s:submit action="connect" theme="simple" key="echobase.action.connectToWorkingDb"/> </li> <s:if test="echoBaseSession.user.admin"> <li> + <s:submit action="createPostgresDb" theme="simple" + key="echobase.action.createPostgresDb"/> + </li> + <li> <s:submit action="clone" theme="simple" key="echobase.action.clone"/> </li> Modified: trunk/src/site/rst/db.rst =================================================================== --- trunk/src/site/rst/db.rst 2013-11-03 10:39:54 UTC (rev 881) +++ trunk/src/site/rst/db.rst 2013-11-04 07:45:35 UTC (rev 882) @@ -101,7 +101,8 @@ su postgres -- Création de l'utilisateur de la base *userName* +- Création de l'utilisateur de la base *userName* (avec des droits de création + de base) :: @@ -109,21 +110,16 @@ - Création de la base de donnée *dbName* -:: +Depuis la version *2.4*, vous pouvez directement créer les bases depuis +l'interface web : - createdb -U postgres -E UTF-8 -O userName dbName +Après avoir créé une configuration de base de travail postgresql, une action +**Créer la base** est disponible (pour les utilisateurs *administrateur*). -- Donner les droits d'acces à l'utilisateur echobase (cela varie d'un système à - l'autre, donc se référer à la documentation du système). Cela fonctionne - lorsqu'on peut accéder à la base via cette commande : +A noter que l'utilisateur pour se connecter à la base doit avoir des droits de +création de base. -:: - psql -h localhost -U userName dbName - -- Il faut ensuite ne pas oublier de créer une configuration de base de travail - pour pouvoir accéder à cette base. - Spatialiser une base postgresql -------------------------------

1 0

r881 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/entities echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb echobase-ui/src/ma
by tchemit＠users.forge.codelutin.com 03 Nov '13

03 Nov '13

Author: tchemit Date: 2013-11-03 11:39:54 +0100 (Sun, 03 Nov 2013) New Revision: 881 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/881 Log: ref #3667: Faciliter la cr?\195?\169ation de nouvelle base Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/TopiaEchoBasePersistenceContext.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/TopiaEchoBasePersistenceContext.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/TopiaEchoBasePersistenceContext.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/TopiaEchoBasePersistenceContext.java 2013-11-03 10:39:54 UTC (rev 881) @@ -200,15 +200,14 @@ return sqlQuery.findMultipleResult(context); } - - public boolean canUpdatePostgis() { + public boolean isPostgresql() { String dialect = context.getHibernateConfiguration().getProperty(TopiaContextFactory.CONFIG_DIALECT); return DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); } public boolean isSpatialAware() { - boolean result = canUpdatePostgis(); + boolean result = isPostgresql(); if (result) { Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-11-03 10:39:54 UTC (rev 881) @@ -23,8 +23,11 @@ * #L% */ +import com.google.common.base.Preconditions; +import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.EchoBaseUserImpl; import fr.ifremer.echobase.entities.data.VoyageImpl; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Transaction; @@ -110,6 +113,42 @@ } } + /** + * Create a configuration to connect to the {@code postgres} database + * from a normal database configuration. + * + * This is used to create a new concrete database. + * + * Note: This only works for postgresql database. + * + * @param jdbcConfiguration jdbc configuration + * @return the jdbcl configuration to {@code postgres} database. + * @since 2.4 + */ + public static JdbcConfiguration newMetaWorkingDb(JdbcConfiguration jdbcConfiguration) { + + String url = jdbcConfiguration.getUrl(); + String dbName = StringUtils.substringAfterLast(url, "/"); + String connectUrl = StringUtils.removeEnd(url, dbName) + "postgres"; + + if (log.isInfoEnabled()) { + log.info("Use meta database conttection url: " + connectUrl); + } + DriverType driverType = jdbcConfiguration.getDriverType(); + + Preconditions.checkArgument( + DriverType.POSTGRESQL.equals(driverType), + "Can't create a meta configuration for a none postgresql database."); + JdbcConfiguration metaConfiguration = JdbcConfiguration.newConfig( + driverType, + connectUrl, + jdbcConfiguration.getLogin(), + jdbcConfiguration.getPassword() + ); + + return metaConfiguration; + } + public static void closeConnection(TopiaContext transaction) { if (transaction == null) { if (log.isTraceEnabled()) { Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2013-11-03 10:39:54 UTC (rev 881) @@ -24,8 +24,8 @@ */ import com.google.common.base.Charsets; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.config.EchoBaseConfigurationOption; -import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseInternalDAOHelper; @@ -73,20 +73,37 @@ */ public static TopiaContext newWorkingDb(JdbcConfiguration jdbcConfiguration) { + TopiaContext result = newWorkingDb(jdbcConfiguration, true); + return result; + } + + /** + * Open a new topia root context from the given jdbc configuration and + * create schema if asked and schema does not exist. + * + * + * @param jdbcConfiguration jdbc configuration + * @return the new fresh root context + * @since 2.4 + */ + public static TopiaContext newWorkingDb(JdbcConfiguration jdbcConfiguration, boolean createSchema) { + Properties properties = loadWorkingDbConfiguration(jdbcConfiguration); TopiaContext result = newDb(properties); - try { - if (!EchoBaseEntityHelper.isWorkingDbSchemaCreated(result)) { + if (createSchema) { + try { + if (!EchoBaseEntityHelper.isWorkingDbSchemaCreated(result)) { - if (log.isInfoEnabled()) { - log.info("Will create schema for " + - jdbcConfiguration.getUrl()); + if (log.isInfoEnabled()) { + log.info("Will create schema for " + + jdbcConfiguration.getUrl()); + } + ((TopiaPersistenceContext) result).createSchema(); } - ((TopiaPersistenceContext) result).createSchema(); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException("Could not create db schema", e); } - } catch (TopiaException e) { - throw new EchoBaseTechnicalException("Could not create db schema", e); } return result; } @@ -198,8 +215,8 @@ } private static void reloadProperty(Properties properties, - String propertyName, - String propertyNameToRemove) { + String propertyName, + String propertyNameToRemove) { Object o = properties.getProperty(propertyName); properties.put(propertyName, o); properties.remove(propertyNameToRemove); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2013-11-03 10:39:54 UTC (rev 881) @@ -266,8 +266,8 @@ return result; } - public boolean canUpdatePostgis() { - boolean result = getEchoBasePersistenceContext().canUpdatePostgis(); + public boolean isPostgresql() { + boolean result = getEchoBasePersistenceContext().isPostgresql(); return result; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java 2013-11-03 10:39:54 UTC (rev 881) @@ -27,10 +27,17 @@ import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.WorkingDbConfiguration; import fr.ifremer.echobase.entities.WorkingDbConfigurationDAO; +import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.AbstractTopiaContext; import java.io.File; +import java.sql.Connection; +import java.sql.SQLException; import java.util.List; /** @@ -41,6 +48,12 @@ */ public class WorkingDbConfigurationService extends EchoBaseServiceSupport { + /** Logger. */ + private static final Log log = + LogFactory.getLog(WorkingDbConfigurationService.class); + + public static final String CREATE_DB_SQL_QUERY = "CREATE DATABASE \"%s\" WITH OWNER = %s ENCODING 'UTF8' TEMPLATE template0;"; + public List<WorkingDbConfiguration> getWorkingDbConfigurations() { try { List<WorkingDbConfiguration> result = getDAO().findAll(); @@ -128,6 +141,43 @@ } } + /** + * Create the concrete working db from his working configuration. + * + * Note: Works only for pg db. + * + * @param jdbcConf id of the configuration to use. + * @since 2.4 + */ + public void createDb(JdbcConfiguration jdbcConf) throws WorkingDbConfigurationNotFoundException { + + + // get the dbName from his url + String url = jdbcConf.getUrl(); + String dbName = StringUtils.substringAfterLast(url, "/"); + + try { + String sql = String.format(CREATE_DB_SQL_QUERY, dbName, jdbcConf.getLogin()); + if (log.isInfoEnabled()) { + log.info("Create new postgres database: " + dbName + " with sql: " + sql); + } + getEchoBasePersistenceContext().getContext().getHibernateSession().doWork( + new AbstractTopiaContext.SQLWork(sql) { + @Override + public void execute(Connection connection) throws SQLException { + //to create a database, need no transaction block + connection.setAutoCommit(true); + super.execute(connection); + } + } + ); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't create a new database: " + dbName, e); + } + } + } + protected WorkingDbConfiguration getExistingConf(String id) throws WorkingDbConfigurationNotFoundException { WorkingDbConfiguration entity = getDAO().findByTopiaId(id); if (entity == null) { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2013-11-03 10:39:54 UTC (rev 881) @@ -165,7 +165,7 @@ * @param jdbcConfiguration the connection configuration to use * @throws TopiaNotFoundException if could not create root context */ - public void initWorkingDb(JdbcConfiguration jdbcConfiguration) throws TopiaNotFoundException { + public void initWorkingDb(JdbcConfiguration jdbcConfiguration, boolean createSchema) throws TopiaNotFoundException { // close any previous db releaseWorkingDb(); @@ -173,7 +173,7 @@ // creates a new topia root context from configuration TopiaContext rootContext = EchobaseTopiaContexts.newWorkingDb( - jdbcConfiguration); + jdbcConfiguration, createSchema); // keep configuration is session set(PROPERTY_WORKING_DB_CONFIGURATION, jdbcConfiguration); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java 2013-11-03 10:39:54 UTC (rev 881) @@ -79,7 +79,7 @@ // can add postgis if working db is postgresql and has still no echobase // spatial db - canAddSpatial = !model.isWithSpatial() && spatialService.canUpdatePostgis(); + canAddSpatial = !model.isWithSpatial() && spatialService.isPostgresql(); } @Override Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2013-11-03 10:39:54 UTC (rev 881) @@ -71,7 +71,7 @@ try { EchoBaseEntityHelper.checkJDBCConnection(jdbcConf); - getEchoBaseSession().initWorkingDb(jdbcConf); + getEchoBaseSession().initWorkingDb(jdbcConf, true); addFlashMessage(_("echobase.info.workingDbconfiguration.connected", conf.getUrl())); result = SUCCESS; Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2013-11-03 10:39:54 UTC (rev 881) @@ -0,0 +1,147 @@ +package fr.ifremer.echobase.ui.actions.workingDb; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2013 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import fr.ifremer.echobase.entities.DriverType; +import fr.ifremer.echobase.persistence.EchoBaseEntityHelper; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.sql.SQLException; + +/** + * To create a fresh postgres database. + * + * Created on 11/3/13. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class CreatePostgresDb extends AbstractWorkingDbAction { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(CreatePostgresDb.class); + + protected String login; + + protected String password; + + protected JdbcConfiguration jdbcConf; + + protected JdbcConfiguration metaJdbcConf; + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @InputConfig(methodName = INPUT) + @Override + public String execute() throws Exception { + + String result = INPUT; + + EchoBaseEntityHelper.checkJDBCConnection(metaJdbcConf); + + try { + + // connect to meta database + getEchoBaseSession().initWorkingDb(metaJdbcConf, false); + + // create database + workingDbConfigurationService.createDb(jdbcConf); + + // connect to new database + getEchoBaseSession().initWorkingDb(jdbcConf, true); + + addFlashMessage(_("echobase.info.workingDb.created", conf.getUrl())); + result = SUCCESS; + + } catch (Exception e) { + + if (log.isErrorEnabled()) { + log.error("Could not create db", e); + } + try { + //close working db if something is wrong. + getEchoBaseSession().releaseWorkingDb(); + } finally { + metaJdbcConf = null; + jdbcConf = null; + addFieldError( + "conf.url", + _("echobase.error.workingDbConfiguration.couldNotCreate", + e.getMessage())); + } + } + return result; + } + + @Override + public void validate() { + + if (!DriverType.POSTGRESQL.equals(getConf().getDriverType())) { + addFieldError( + "conf.driverType", + _("echobase.error.workingDbConfiguration.createOnlyOnPostgresql")); + } + jdbcConf = JdbcConfiguration.newConfig( + getConf().getDriverType(), getConf().getUrl(), + login, password); + + // gets the meta db configuration + metaJdbcConf = EchoBaseEntityHelper.newMetaWorkingDb(jdbcConf); + + // check connection is ok + try { + EchoBaseEntityHelper.checkJDBCConnection(metaJdbcConf); + } catch (SQLException e) { + jdbcConf = null; + addFieldError( + "login", + _("echobase.error.workingDbConfiguration.couldNotConnect", + e.getMessage())); + addFieldError( + "password", + _("echobase.error.workingDbConfiguration.couldNotConnect", + e.getMessage())); + } + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2013-11-03 10:39:54 UTC (rev 881) @@ -83,7 +83,7 @@ // can add postgis if working db is postgresql and has still no echobase // spatial db - canAddSpatial = !spatialAware && spatialService.canUpdatePostgis(); + canAddSpatial = !spatialAware && spatialService.isPostgresql(); return SUCCESS; } Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2013-11-03 10:39:54 UTC (rev 881) @@ -95,6 +95,17 @@ <result type="redirectToShowList"/> </action> +  + <action name="createPostgresDb" method="execute" + class="fr.ifremer.echobase.ui.actions.workingDb.CreatePostgresDb"> + <interceptor-ref name="prepareParamsStackLoggued"/> + <result name="input" type="showList"/> + <result type="redirectAction"> + <param name="actionName">information</param> + <param name="namespace">/workingDb</param> + </result> + </action> +  <action name="connect" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.Connect"> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-03 10:39:54 UTC (rev 881) @@ -8,10 +8,12 @@ echobase.action.createEmbeddedApplication=Create a portable database echobase.action.createMission=Create mission echobase.action.createNewMission=Create a new mission +echobase.action.createPostgresDb=Create database echobase.action.createSqlQuery=Save echobase.action.createWorkingDbConfiguration=Save echobase.action.delete=Delete echobase.action.delete.selectedImport=Delete selected imports +echobase.action.deleteConfiguration=Delete echobase.action.display=Display spatial data echobase.action.downloadEmbeddedApplicationFile=Download the portable database echobase.action.downloadExportDbFile=Download database export file @@ -231,6 +233,8 @@ echobase.error.showData.voyage.required=Voyage required echobase.error.warlocation.notFound=Database .war file not found at location %s echobase.error.workingDbConfiguration.couldNotConnect=Could not connect to database (%s) +echobase.error.workingDbConfiguration.couldNotCreate=Could not create new postgres database +echobase.error.workingDbConfiguration.createOnlyOnPostgresql=Database creation is only possible for *Postgresql* type echobase.error.workingDbConfiguration.description.required=Mandatory description echobase.error.workingDbConfiguration.login.required=Mandatory login echobase.error.workingDbConfiguration.url.already.exists=A configuration with same url already exists @@ -274,6 +278,7 @@ echobase.info.user.delete=User %s deleted echobase.info.user.update=User %s updated echobase.info.userSupport=User support +echobase.info.workingDb.created=New database %s created echobase.info.workingDbconfiguration.connected=Connection to the working database '%s' successful echobase.info.workingDbconfiguration.created=Working database configuration '%s' created echobase.info.workingDbconfiguration.deleted=Working database configuration '%s' deleted Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-03 10:39:54 UTC (rev 881) @@ -8,10 +8,12 @@ echobase.action.createEmbeddedApplication=Créer l'application echobase.action.createMission=Créer la mission echobase.action.createNewMission=Créer une nouvelle mission +echobase.action.createPostgresDb=Créer la base echobase.action.createSqlQuery=Enregistrer echobase.action.createWorkingDbConfiguration=Enregistrer echobase.action.delete=Suppression echobase.action.delete.selectedImport=Supprimer les imports sélectionnés +echobase.action.deleteConfiguration=Supprimer echobase.action.display=Afficher les données echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complète @@ -232,6 +234,8 @@ echobase.error.showData.voyage.required=La sélection d'une campagne est obligatoire echobase.error.warlocation.notFound=L'application n'a pas été trouvée à l'emplacement suivant %s echobase.error.workingDbConfiguration.couldNotConnect=Impossible de se connecter (%s) +echobase.error.workingDbConfiguration.couldNotCreate=Impossible de créer la nouvelle base postgres +echobase.error.workingDbConfiguration.createOnlyOnPostgresql=La création d'une base n'est possible que pour le type *Postgresql* echobase.error.workingDbConfiguration.description.required=Description obligatoire echobase.error.workingDbConfiguration.login.required=Login obligatoire echobase.error.workingDbConfiguration.url.already.exists=Une configuration existe déjà avec cette url @@ -275,6 +279,7 @@ echobase.info.user.delete=L'utilisateur '%s' a été supprimé echobase.info.user.update=L'utilisateur '%s' a été mis à jour echobase.info.userSupport=Support utilisateur +echobase.info.workingDb.created=Nouvelle base de donnée %s créée echobase.info.workingDbconfiguration.connected=Connexion à la base de travail '%s' réussie echobase.info.workingDbconfiguration.created=Configuration à la base de travail '%s' créée echobase.info.workingDbconfiguration.deleted=Configuration à la base de travail '%s' supprimée Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2013-11-02 11:48:19 UTC (rev 880) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2013-11-03 10:39:54 UTC (rev 881) @@ -101,6 +101,12 @@ <ul id="dbeditorToolbar" class="toolbar floatRight"> <s:if test="confExists"> + <s:if test="echoBaseSession.user.admin"> + <li> + <s:submit action="createPostgresDb" theme="simple" + key="echobase.action.createPostgresDb"/> + </li> + </s:if> <li> <s:submit action="connect" theme="simple" key="echobase.action.connectToWorkingDb"/> @@ -112,7 +118,7 @@ </li> <li> <s:submit onclick="return confirmDelete();" theme="simple" - key="echobase.action.delete"/> + key="echobase.action.deleteConfiguration"/> </li> </s:if> </s:if>

1 0

r880 - trunk
by tchemit＠users.forge.codelutin.com 02 Nov '13

02 Nov '13

Author: tchemit Date: 2013-11-02 12:48:19 +0100 (Sat, 02 Nov 2013) New Revision: 880 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/880 Log: fixes #3665: Updates mavenpom to 4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-01 14:52:13 UTC (rev 879) +++ trunk/pom.xml 2013-11-02 11:48:19 UTC (rev 880) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r879 - trunk
by tchemit＠users.forge.codelutin.com 01 Nov '13

01 Nov '13

Author: tchemit Date: 2013-11-01 15:52:13 +0100 (Fri, 01 Nov 2013) New Revision: 879 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/879 Log: fixes #3665: Updates mavenpom to 4.2 refs #3666: Updates i18n-m-p to 2.5.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-01 13:55:16 UTC (rev 878) +++ trunk/pom.xml 2013-11-01 14:52:13 UTC (rev 879) @@ -139,21 +139,16 @@  - <eugenePluginVersion>2.7.2</eugenePluginVersion> <topiaVersion>3.0-alpha-3.1</topiaVersion> - <nuitonUtilsVersion>2.7</nuitonUtilsVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonWebVersion>1.14</nuitonWebVersion> - <msaccessImporterVersion>1.4.1</msaccessImporterVersion> + <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> <struts2Version>2.3.15.3</struts2Version> - <jqueryPluginVersion>3.6.0</jqueryPluginVersion> - <h2Version>1.3.173</h2Version> + <jqueryPluginVersion>3.6.1</jqueryPluginVersion> + <h2Version>1.3.174</h2Version> <postgresqlVersion>9.2-1003-jdbc4</postgresqlVersion> <slf4jVersion>1.7.5</slf4jVersion> - <jackcessVersion>1.2.13</jackcessVersion> - <hibernateVersion>4.2.4.Final</hibernateVersion> - <googleSearchEnabled>true</googleSearchEnabled>  @@ -182,14 +177,14 @@ <dependency> <groupId>fr.ird</groupId> <artifactId>msaccess-importer</artifactId> - <version>${msaccessImporterVersion}</version> + <version>1.4.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.healthmarketscience.jackcess</groupId> <artifactId>jackcess</artifactId> - <version>${jackcessVersion}</version> + <version>1.2.14.3</version> </dependency>  @@ -211,13 +206,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> </dependency> <dependency> @@ -278,7 +273,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> + <version>4.2.5.Final</version> </dependency>  @@ -408,7 +403,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>${eugenePluginVersion}</version> + <version>2.7.1</version> </plugin> <plugin>

1 0

r878 - trunk
by tchemit＠users.forge.codelutin.com 01 Nov '13

01 Nov '13

Author: tchemit Date: 2013-11-01 14:55:16 +0100 (Fri, 01 Nov 2013) New Revision: 878 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/878 Log: fixes #3666: Updates somes plugins Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-01 06:16:42 UTC (rev 877) +++ trunk/pom.xml 2013-11-01 13:55:16 UTC (rev 878) @@ -139,10 +139,10 @@  - <eugenePluginVersion>2.7.1</eugenePluginVersion> + <eugenePluginVersion>2.7.2</eugenePluginVersion> <topiaVersion>3.0-alpha-3.1</topiaVersion> <nuitonUtilsVersion>2.7</nuitonUtilsVersion> - <nuitonI18nVersion>2.5.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonWebVersion>1.14</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.15.3</struts2Version>

1 0

r877 - trunk
by tchemit＠users.forge.codelutin.com 01 Nov '13

01 Nov '13

Author: tchemit Date: 2013-11-01 07:16:42 +0100 (Fri, 01 Nov 2013) New Revision: 877 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/877 Log: refs #3665: Updates mavenpom to 4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-31 23:22:48 UTC (rev 876) +++ trunk/pom.xml 2013-11-01 06:16:42 UTC (rev 877) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.1</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId>

1 0