Author: tchemit Date: 2013-07-11 18:51:18 +0200 (Thu, 11 Jul 2013) New Revision: 814 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/814 Log: refs #2870: Mise ?\195?\160 jour des librairies + migration topia 3.0 Modified: trunk/echobase-domain/pom.xml trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java trunk/echobase-domain/src/main/resources/echobase-internaldb.properties trunk/echobase-domain/src/main/resources/echobase-workingdb.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/pom.xml 2013-07-11 16:51:18 UTC (rev 814) @@ -136,6 +136,11 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> </dependency> Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java 2013-07-11 16:51:18 UTC (rev 814) @@ -23,8 +23,9 @@ * #L% */ -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfigProvider; +import org.nuiton.util.config.ApplicationConfigProvider; +import org.nuiton.util.config.ConfigActionDef; +import org.nuiton.util.config.ConfigOptionDef; import java.util.Locale; @@ -49,12 +50,12 @@ } @Override - public ApplicationConfig.OptionDef[] getOptions() { + public ConfigOptionDef[] getOptions() { return EchoBaseConfigurationOption.values(); } @Override - public ApplicationConfig.ActionDef[] getActions() { - return new ApplicationConfig.ActionDef[0]; + public ConfigActionDef[] getActions() { + return new ConfigActionDef[0]; } } Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2013-07-11 16:51:18 UTC (rev 814) @@ -27,8 +27,8 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.util.config.ArgumentsParserException; import org.nuiton.util.FileUtil; import org.nuiton.util.Version; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2013-07-11 16:51:18 UTC (rev 814) @@ -22,8 +22,8 @@ */ package fr.ifremer.echobase; -import org.nuiton.util.ApplicationConfig; import org.nuiton.util.Version; +import org.nuiton.util.config.ConfigOptionDef; import java.io.File; import java.net.URL; @@ -36,7 +36,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public enum EchoBaseConfigurationOption implements ApplicationConfig.OptionDef { +public enum EchoBaseConfigurationOption implements ConfigOptionDef { /** Main directory where to put echobase data (logs, and others...). */ DATA_DIRECTORY("echobase.data.directory", @@ -67,9 +67,9 @@ "${echobase.data.directory}/war/echobase-ui-${echobase.version}-embedded.war", File.class), DOCUMENTATION_URL("echobase.documentationUrl", - n_("echobase.config.documentationUrl.description"), - "http://maven-site.forge.codelutin.com/echobase", - URL.class); + n_("echobase.config.documentationUrl.description"), + "http://maven-site.forge.codelutin.com/echobase", + URL.class); /** Configuration key. */ protected final String key; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java 2013-07-11 16:51:18 UTC (rev 814) @@ -40,7 +40,7 @@ List<Object> params = Lists.<Object>newArrayList("name", queryName); if (StringUtils.isNotBlank(id)) { - hql += " AND " + ExportQuery.TOPIA_ID + " = :id"; + hql += " AND " + ExportQuery.PROPERTY_TOPIA_ID + " = :id"; params.add("id"); params.add(id); } 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-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-07-11 16:51:18 UTC (rev 814) @@ -123,18 +123,15 @@ log.debug("closing transaction " + transaction); } - try { - Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); - if (!tx.wasCommitted() && !tx.wasRolledBack()) { - if (log.isDebugEnabled()) { - log.debug("rollback transaction!"); - } - tx.rollback(); + + Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); } - transaction.closeContext(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + tx.rollback(); } + transaction.closeContext(); } } 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-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2013-07-11 16:51:18 UTC (rev 814) @@ -50,11 +50,7 @@ @Override public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, Class<E> type) { - try { - return EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO(tx, type); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + return EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO(tx, type); } @Override 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-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2013-07-11 16:51:18 UTC (rev 814) @@ -34,8 +34,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.RecursiveProperties; import java.io.File; @@ -188,17 +186,14 @@ * @return the new fresh root context */ private static TopiaContext newDb(Properties configuration) { - try { - if (log.isInfoEnabled()) { - log.info("Starts a db at : " + - configuration.get(TopiaContextFactory.CONFIG_URL)); - } - TopiaContext result = TopiaContextFactory.getContext(configuration); - return result; - } catch (TopiaNotFoundException e) { - throw new TopiaRuntimeException("Could not init db", e); + if (log.isInfoEnabled()) { + log.info("Starts a db at : " + + configuration.get(TopiaContextFactory.CONFIG_URL)); } + TopiaContext result = TopiaContextFactory.getContext(configuration); + + return result; } public static void reloadProperty(Properties properties, Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-07-11 16:51:18 UTC (rev 814) @@ -32,11 +32,9 @@ import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; import java.util.Date; import java.util.List; @@ -191,16 +189,6 @@ } } - protected <E extends TopiaEntity> TopiaDAO<E> getDAOFromId(String id) { - try { - return getDAO(TopiaId.getClassName(id)); - } catch (TopiaNotFoundException e) { - - throw new EchoBaseTechnicalException( - "Could not find class from id: " + id, e); - } - } - protected final <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityType, Class<D> daoType) { TopiaDAO<E> dao = getDAO(entityType); Preconditions.checkState(daoType.isAssignableFrom(dao.getClass())); Modified: trunk/echobase-domain/src/main/resources/echobase-internaldb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2013-07-11 16:51:18 UTC (rev 814) @@ -37,6 +37,8 @@ hibernate.format_sql=false hibernate.use_sql_comments=false +topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.LegacyTopiaIdFactory + # Database migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallback Modified: trunk/echobase-domain/src/main/resources/echobase-workingdb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2013-07-11 16:51:18 UTC (rev 814) @@ -37,6 +37,8 @@ hibernate.format_sql=false hibernate.use_sql_comments=false +topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.LegacyTopiaIdFactory + # Database migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallback Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2013-07-11 16:51:18 UTC (rev 814) @@ -180,7 +180,7 @@ try { TopiaDAO<?> dao = getDAO(entityEnum.getContract()); TopiaEntity entity = dao.findByTopiaId(topiaId); - ExportModel<TopiaEntity> model = buildForLoad(tableMeta, TopiaEntity.TOPIA_ID, true); + ExportModel<TopiaEntity> model = buildForLoad(tableMeta, TopiaEntity.PROPERTY_TOPIA_ID, true); return loadRow(entity, model); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); @@ -275,7 +275,7 @@ throw new EchoBaseTechnicalException( "Could not found entity with id " + id); } else { - entityToSave = dao.create(TopiaEntity.TOPIA_ID, id); + entityToSave = dao.create(TopiaEntity.PROPERTY_TOPIA_ID, id); create = true; } } @@ -539,7 +539,7 @@ EntityCsvModel<EchoBaseEntityEnum, E> model = EntityCsvModel.newModel( getConfiguration().getCsvSeparator(), meta, - TopiaEntity.TOPIA_ID + TopiaEntity.PROPERTY_TOPIA_ID ); for (ColumnMeta columnMeta : meta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2013-07-11 16:51:18 UTC (rev 814) @@ -112,7 +112,7 @@ EntityCsvModel<EchoBaseEntityEnum, E> model = EntityCsvModel.newModel( getConfiguration().getCsvSeparator(), meta, - TopiaEntity.TOPIA_ID + TopiaEntity.PROPERTY_TOPIA_ID ); for (ColumnMeta columnMeta : meta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2013-07-11 16:51:18 UTC (rev 814) @@ -70,7 +70,7 @@ EntityCsvModel<EchoBaseEntityEnum, E> model = EntityCsvModel.newModel( csvSeparator, meta, - TopiaEntity.TOPIA_ID + TopiaEntity.PROPERTY_TOPIA_ID ); for (ColumnMeta columnMeta : meta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2013-07-11 16:51:18 UTC (rev 814) @@ -48,7 +48,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.util.TimeLog; import org.nuiton.util.decorator.Decorator; @@ -297,4 +301,16 @@ "Could not find out if id " + id + " exists.", e); } } + + protected <E extends TopiaEntity> TopiaDAO<E> getDAOFromId(String id) { + try { + TopiaIdFactory topiaIdFactory = ((TopiaContextImplementor) getTransaction()).getTopiaIdFactory(); + Class<E> className = topiaIdFactory.getClassName(id); + return getDAO(className); + } catch (TopiaNotFoundException e) { + + throw new EchoBaseTechnicalException( + "Could not find class from id: " + id, e); + } + } } 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-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2013-07-11 16:51:18 UTC (rev 814) @@ -38,7 +38,6 @@ import org.junit.runner.Description; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.FileUtil; import java.io.File; @@ -156,11 +155,7 @@ protected void finished(Description description) { super.finished(description); if (!rootContext.isClosed()) { - try { - rootContext.closeContext(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + rootContext.closeContext(); } } @@ -168,11 +163,7 @@ @Override public TopiaContext getTransaction() { if (transaction == null) { - try { - transaction = rootContext.beginTransaction(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + transaction = rootContext.beginTransaction(); } return transaction; } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2013-07-11 16:51:18 UTC (rev 814) @@ -97,9 +97,10 @@ import org.junit.Assert; import org.junit.Before; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdFactory; import java.util.List; @@ -337,7 +338,9 @@ } private <E extends TopiaEntity> E getEntity(String id) throws TopiaException { - Class entityType = TopiaId.getClassName(id); + + TopiaIdFactory topiaIdFactory = ((TopiaContextImplementor) getTransaction()).getTopiaIdFactory(); + Class entityType = topiaIdFactory.getClassName(id); TopiaDAO<E> dao = getDAO(entityType); E entity = dao.findByTopiaId(id); return entity; @@ -347,7 +350,7 @@ // create voyage Voyage voyage = create(voyageDao, - TopiaEntity.TOPIA_ID, voyage1Id, + TopiaEntity.PROPERTY_TOPIA_ID, voyage1Id, Voyage.PROPERTY_MISSION, getFirstEntity(Mission.class), Voyage.PROPERTY_NAME, "voyage1", Voyage.PROPERTY_START_DATE, newDate(), @@ -360,7 +363,7 @@ // create transit Transit transit = create(transitDAO, - TopiaEntity.TOPIA_ID, transit1Id, + TopiaEntity.PROPERTY_TOPIA_ID, transit1Id, Transit.PROPERTY_START_TIME, newDate(), Transit.PROPERTY_END_TIME, newDate(), Transit.PROPERTY_START_LOCALITY, "transit1tartLocality", @@ -372,7 +375,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect1Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect1Id, Transect.PROPERTY_TITLE, "transect1Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect1Stratum" @@ -394,7 +397,7 @@ // create voyage Voyage voyage = create(voyageDao, - TopiaEntity.TOPIA_ID, voyage2Id, + TopiaEntity.PROPERTY_TOPIA_ID, voyage2Id, Voyage.PROPERTY_MISSION, getFirstEntity(Mission.class), Voyage.PROPERTY_NAME, "voyage2", Voyage.PROPERTY_START_DATE, newDate(), @@ -407,7 +410,7 @@ // create transit Transit transit = create(transitDAO, - TopiaEntity.TOPIA_ID, transit2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transit2Id, Transit.PROPERTY_START_TIME, newDate(), Transit.PROPERTY_END_TIME, newDate(), Transit.PROPERTY_START_LOCALITY, "transit2StartLocality", @@ -419,7 +422,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect2Id, Transect.PROPERTY_TITLE, "transect2Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect2Stratum" @@ -443,7 +446,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect1_2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect1_2Id, Transect.PROPERTY_TITLE, "transect12Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect12Stratum" @@ -467,7 +470,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect2_2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect2_2Id, Transect.PROPERTY_TITLE, "transect22Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect22Stratum" @@ -491,7 +494,7 @@ // create operation Operation operation = create(operationDAO, - TopiaEntity.TOPIA_ID, operation1Id, + TopiaEntity.PROPERTY_TOPIA_ID, operation1Id, Operation.PROPERTY_ID, "operationId", Operation.PROPERTY_GEAR, getFirstEntity(Gear.class) ); @@ -533,7 +536,7 @@ // create totalSample Sample totalSample = create(sampleDAO, - TopiaEntity.TOPIA_ID, totalSample1Id, + TopiaEntity.PROPERTY_TOPIA_ID, totalSample1Id, Sample.PROPERTY_SAMPLE_TYPE, getFirstEntity(SampleType.class), Sample.PROPERTY_SPECIES_CATEGORY, getFirstEntity(SpeciesCategory.class), Sample.PROPERTY_NUMBER_SAMPLED, 10, @@ -550,7 +553,7 @@ // create subSample Sample subSample = create(sampleDAO, - TopiaEntity.TOPIA_ID, subSample1Id, + TopiaEntity.PROPERTY_TOPIA_ID, subSample1Id, Sample.PROPERTY_SAMPLE_TYPE, getFirstEntity(SampleType.class), Sample.PROPERTY_SPECIES_CATEGORY, getFirstEntity(SpeciesCategory.class), Sample.PROPERTY_NUMBER_SAMPLED, 10, @@ -566,7 +569,7 @@ // create biometrySample Sample biometrySample = create(sampleDAO, - TopiaEntity.TOPIA_ID, biometrySample1Id, + TopiaEntity.PROPERTY_TOPIA_ID, biometrySample1Id, Sample.PROPERTY_SAMPLE_TYPE, getFirstEntity(SampleType.class), Sample.PROPERTY_SPECIES_CATEGORY, getFirstEntity(SpeciesCategory.class), Sample.PROPERTY_NUMBER_SAMPLED, 10, @@ -596,7 +599,7 @@ // create data acquisition DataAcquisition dataAcquisition = create(dataAcquisitionDAO, - TopiaEntity.TOPIA_ID, dataAcquisition1Id, + TopiaEntity.PROPERTY_TOPIA_ID, dataAcquisition1Id, DataAcquisition.PROPERTY_ACOUSTIC_INSTRUMENT, getFirstEntity(AcousticInstrument.class)); transect.addDataAcquisition(dataAcquisition); @@ -608,7 +611,7 @@ // create esdu cell Cell esduCell = create(cellDAO, - TopiaEntity.TOPIA_ID, cellEsdu1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellEsdu1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellEsdu1"); dataProcessing.addCell(esduCell); @@ -621,7 +624,7 @@ // create elementary cell Cell elementaryCell = create(cellDAO, - TopiaEntity.TOPIA_ID, cellElementary1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellElementary1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellElementary1"); esduCell.addChilds(elementaryCell); @@ -647,13 +650,13 @@ // create echotype Echotype echotype = create(echotypeDAO, - TopiaEntity.TOPIA_ID, echotype1Id, + TopiaEntity.PROPERTY_TOPIA_ID, echotype1Id, Echotype.PROPERTY_NAME, "echotype1Name"); voyage.addEchotype(echotype); // create lengthAgeKey LengthAgeKey lengthAgeKey = create(lengthAgeKeyDAO, - TopiaEntity.TOPIA_ID, lengthAgeKey1Id, + TopiaEntity.PROPERTY_TOPIA_ID, lengthAgeKey1Id, LengthAgeKey.PROPERTY_AGE, 12, LengthAgeKey.PROPERTY_LENGTH, 12.5f, LengthAgeKey.PROPERTY_METADATA, "lengthAgeKeyMetadata1", @@ -665,7 +668,7 @@ // create lengthWeightKey LengthWeightKey lengthWeightKey = create(lengthWeightKeyDAO, - TopiaEntity.TOPIA_ID, lengthWeightKey1Id, + TopiaEntity.PROPERTY_TOPIA_ID, lengthWeightKey1Id, LengthWeightKey.PROPERTY_APARAMETER, 12.5f, LengthWeightKey.PROPERTY_BPARAMETER, 0.2f, LengthWeightKey.PROPERTY_METADATA, "lengthWeightMetadata1", @@ -690,7 +693,7 @@ Category category = create(categoryDAO); Result result = create(resultDAO, - TopiaEntity.TOPIA_ID, resultEsdu1Id, + TopiaEntity.PROPERTY_TOPIA_ID, resultEsdu1Id, Result.PROPERTY_CATEGORY, category, Result.PROPERTY_DATA_METADATA, getFirstEntity(DataMetadata.class), Result.PROPERTY_RESULT_VALUE, "resultValueEdsu1", @@ -713,7 +716,7 @@ // create region Cell region = create(cellDAO, - TopiaEntity.TOPIA_ID, cellRegion1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellRegion1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellRegion1"); @@ -727,7 +730,7 @@ // create result (on region) Category category = create(categoryDAO); Result result = create(resultDAO, - TopiaEntity.TOPIA_ID, resultRegion1Id, + TopiaEntity.PROPERTY_TOPIA_ID, resultRegion1Id, Result.PROPERTY_CATEGORY, category, Result.PROPERTY_DATA_METADATA, getFirstEntity(DataMetadata.class), Result.PROPERTY_RESULT_VALUE, "resultValueRegion1", @@ -748,7 +751,7 @@ // create map Cell map = create(cellDAO, - TopiaEntity.TOPIA_ID, cellMap1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellMap1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellMap1"); @@ -758,7 +761,7 @@ // create result (on map) Category category = create(categoryDAO); Result result = create(resultDAO, - TopiaEntity.TOPIA_ID, resultMap1Id, + TopiaEntity.PROPERTY_TOPIA_ID, resultMap1Id, Result.PROPERTY_CATEGORY, category, Result.PROPERTY_DATA_METADATA, getFirstEntity(DataMetadata.class), Result.PROPERTY_RESULT_VALUE, "resultValueMap1", Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2013-07-11 16:51:18 UTC (rev 814) @@ -44,8 +44,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; import org.nuiton.topia.persistence.csv.EntityCsvModel; import org.nuiton.topia.persistence.csv.in.CsvImportResult; import org.nuiton.topia.persistence.csv.in.ImportModelFactory; @@ -437,7 +437,7 @@ EchoBaseEntityEnum target = associationMeta.getTarget(); List<TopiaEntity> targetEntities = (List<TopiaEntity>) getEntities(target.getContract()); Map<String, TopiaEntity> targetsById = - Maps.uniqueIndex(targetEntities, TopiaId.GET_TOPIA_ID); + Maps.uniqueIndex(targetEntities, TopiaEntities.getTopiaIdFunction()); ImportModel<Map<String, Object>> model = modelFactory.buildForImport(associationMeta); @@ -447,10 +447,10 @@ List<E> sourceEntities = (List<E>) getEntities(sourceType.getContract()); Map<String, E> sourcesById = - Maps.uniqueIndex(sourceEntities, TopiaId.GET_TOPIA_ID); + Maps.uniqueIndex(sourceEntities, TopiaEntities.getTopiaIdFunction()); try { for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); E e = sourcesById.get(topiaId); String[] associations = (String[]) row.get("target"); List<TopiaEntity> associationEntities = Lists.newArrayList(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2013-07-11 16:51:18 UTC (rev 814) @@ -45,7 +45,6 @@ import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.converter.ConverterUtil; import javax.servlet.ServletContext; @@ -140,17 +139,15 @@ ); // init database (and create minimal admin user if required) - try { - initInternalDatabase(applicationContext, serviceContext); - } catch (TopiaException e) { - throw new TopiaRuntimeException("Could not init internal db", e); - } + initInternalDatabase(applicationContext, serviceContext); + + // copy drivers if required try { copyDriverFiles(serviceContext); } catch (IOException e) { - throw new TopiaRuntimeException("Could not install drivers", e); + throw new TopiaException("Could not install drivers", e); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-11 16:51:18 UTC (rev 814) @@ -30,8 +30,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsStatics; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; import javax.servlet.ServletRequest; @@ -56,20 +54,16 @@ } @Override - protected TopiaContext beginTransaction(ServletRequest request) throws TopiaRuntimeException { + protected TopiaContext beginTransaction(ServletRequest request) { EchoBaseApplicationContext applicationContext = EchoBaseActionSupport.getEchoBaseApplicationContext(); TopiaContext rootContext = applicationContext.getInternalRootContext(); - try { - TopiaContext transaction = rootContext.beginTransaction(); - if (log.isDebugEnabled()) { - log.debug("Starts a new echo transaction " + transaction); - } - return transaction; - } catch (TopiaException eee) { - throw new TopiaRuntimeException("Could not start transaction", eee); + TopiaContext transaction = rootContext.beginTransaction(); + if (log.isDebugEnabled()) { + log.debug("Starts a new echo transaction " + transaction); } + return transaction; } /** Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java 2013-07-11 16:51:18 UTC (rev 814) @@ -29,8 +29,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsStatics; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; import javax.servlet.FilterConfig; @@ -76,15 +74,11 @@ Preconditions.checkNotNull(userSession); TopiaContext rootContext = userSession.getWorkingDbRootContext(); Preconditions.checkNotNull(rootContext); - try { - TopiaContext transaction = rootContext.beginTransaction(); - if (log.isDebugEnabled()) { - log.debug("Starts a new working db transaction " + transaction); - } - return transaction; - } catch (TopiaException eee) { - throw new TopiaRuntimeException("Could not start transaction", eee); + TopiaContext transaction = rootContext.beginTransaction(); + if (log.isDebugEnabled()) { + log.debug("Starts a new working db transaction " + transaction); } + return transaction; } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2013-07-11 16:51:18 UTC (rev 814) @@ -87,7 +87,7 @@ } } } - properties.put(TopiaEntity.TOPIA_ID, topiaId); + properties.put(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); service.saveEntity(tableMeta, properties, Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/pom.xml 2013-07-11 16:51:18 UTC (rev 814) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>3.4.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -131,20 +131,20 @@ <!-- libraries version --> - <eugenePluginVersion>2.6.1</eugenePluginVersion> - <topiaVersion>2.8-rc-1</topiaVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.12-beta-2</nuitonWebVersion> + <eugenePluginVersion>2.6.4-SNAPSHOT</eugenePluginVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <nuitonUtilsVersion>2.6.13-SNAPSHOT</nuitonUtilsVersion> + <nuitonI18nVersion>2.5.1</nuitonI18nVersion> + <nuitonWebVersion>1.14</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.8</struts2Version> - <jqueryPluginVersion>3.5.0</jqueryPluginVersion> - <h2Version>1.3.171</h2Version> + <struts2Version>2.3.15</struts2Version> + <jqueryPluginVersion>3.6.0</jqueryPluginVersion> + <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.7.5</slf4jVersion> - <jackcessVersion>1.2.10</jackcessVersion> + <jackcessVersion>1.2.13</jackcessVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> + <hibernateVersion>4.2.1.Final</hibernateVersion> <googleSearchEnabled>true</googleSearchEnabled> @@ -192,6 +192,13 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> </dependency>