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

r489 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 16:55:17 +0200 (Wed, 04 Apr 2012) New Revision: 489 Url: http://forge.codelutin.com/repositories/revision/echobase/489 Log: fixes #1085: Les clefs naturels ne sont pas mutables\! Modified: trunk/echobase-entities/src/main/xmi/echobase.properties Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-04 14:04:32 UTC (rev 488) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-04 14:55:17 UTC (rev 489) @@ -60,7 +60,7 @@ ### Natural id for references ################################################ ############################################################################### -fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.notNull=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.password.tagValue.notNull=true @@ -71,143 +71,143 @@ fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationDate.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationUser.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.ExportQuery.attribute.description.tagValue.notNull=true fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagValue.notNull=true fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedDate.tagValue.notNull=true fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedUser.tagValue.notNull=true -fr.ifremer.echobase.entities.references.AcousticInstrument.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.AcousticInstrument.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.AgeCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.AgeCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AgeCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AgeCategory.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.references.AgeCategory.attribute.meaning.tagValue.notNull=true -fr.ifremer.echobase.entities.references.AreaOfOperation.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.AreaOfOperation.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AreaOfOperation.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AreaOfOperation.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.Calibration.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.Calibration.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.Calibration.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.CategoryMeaning.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CategoryMeaning.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CategoryMeaning.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CategoryMeaning.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.CategoryRef.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.CategoryRef.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.CategoryRef.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.CategoryType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CategoryType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CategoryType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CategoryType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.CellMethod.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CellMethod.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CellMethod.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CellMethod.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.CellType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CellType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CellType.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CellType.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.DataMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.DataMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.DataMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.DataMetadata.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.DataProtocol.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.DataProtocol.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.DataProtocol.attribute.code.tagValue.naturalId=true -#fr.ifremer.echobase.entities.references.DataQuality.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.DataQuality.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.DataQuality.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.DataType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.DataType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.DataType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.DataType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.DepthStratum.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.DepthStratum.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.DepthStratum.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.DepthStratum.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.EchotypeCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.EchotypeCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.EchotypeCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.EchotypeCategory.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.Gear.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Gear.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Gear.attribute.casinoGearName.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Gear.attribute.casinoGearName.tagValue.notNull=true -fr.ifremer.echobase.entities.references.GearCharacteristic.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.GearCharacteristic.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.GearCharacteristic.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.GearCharacteristic.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.GearCharacteristicValue.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.GearCharacteristicValue.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.GearCharacteristicValue.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.GearMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.GearMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.GearMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.GearMetadata.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.Impacte.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.Impacte.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.Impacte.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.MeasurementMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.MeasurementMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.MeasurementMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.MeasurementMetadata.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.MeasureType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.MeasureType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.MeasureType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.MeasureType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.Mission.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Mission.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Mission.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Mission.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.OperationEvent.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.OperationEvent.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.OperationEvent.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.OperationEvent.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.OperationMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.OperationMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.OperationMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.OperationMetadata.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.ReferenceDatum.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.ReferenceDatum.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.ReferenceDatum.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.ReferenceDatum.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.ReferenceDatumType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.ReferenceDatumType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.ReferenceDatumType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.ReferenceDatumType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.ReferencingMethod.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.ReferencingMethod.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.ReferencingMethod.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.ReferencingMethod.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SampleDataType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SampleDataType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SampleDataType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SampleDataType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SampleType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SampleType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SampleType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SampleType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SexCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SexCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SexCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SexCategory.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.references.SexCategory.attribute.meaning.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SizeCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SizeCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SizeCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SizeCategory.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.references.SizeCategory.attribute.meaning.tagValue.notNull=true -fr.ifremer.echobase.entities.references.Species.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Species.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Species.attribute.baracoudaCode.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Species.attribute.baracoudaCode.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SpeciesCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SpeciesCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.species.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.sizeCategory.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.ageCategory.tagValue.naturalId=true @@ -217,18 +217,18 @@ fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.ageCategory.tagValue.notNull=false fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.sexCategory.tagValue.notNull=false -fr.ifremer.echobase.entities.references.Strata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Strata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Strata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Strata.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.TSParameters.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.TSParameters.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.TSParameters.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.Vessel.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Vessel.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.VesselType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.VesselType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.notNull=true @@ -236,7 +236,7 @@ ### Natural id for data ###################################################### ############################################################################### -fr.ifremer.echobase.entities.data.Category.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.data.Category.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.data.Category.attribute.depthStratum.tagValue.naturalId=true fr.ifremer.echobase.entities.data.Category.attribute.echotype.tagValue.naturalId=true fr.ifremer.echobase.entities.data.Category.attribute.speciesCategory.tagValue.naturalId=true @@ -303,7 +303,7 @@ fr.ifremer.echobase.entities.data.Transit.attribute.description.tagValue.notNull=true fr.ifremer.echobase.entities.data.Transit.attribute.relatedActivity.tagValue.notNull=true -fr.ifremer.echobase.entities.data.Voyage.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.data.Voyage.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.data.Voyage.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.data.Voyage.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.startDate.tagValue.notNull=true

1 0

r488 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources echobase-services/src/main/resources/embedded echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 16:04:32 +0200 (Wed, 04 Apr 2012) New Revision: 488 Url: http://forge.codelutin.com/repositories/revision/echobase/488 Log: refs #1084: Apr?\195?\168s un import en erreur, impossible d'en recommencer un (am?\195?\169lioration) Removed: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties trunk/echobase-services/src/main/resources/embedded/echobase.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java trunk/echobase-ui/src/main/resources/echobase.properties Deleted: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java 2012-04-04 14:04:32 UTC (rev 488) @@ -1,87 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 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% - */ -package fr.ifremer.echobase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.framework.TopiaConnectionProvider; - -import java.sql.Connection; -import java.sql.SQLException; - -/** - * To fix roolback errors. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.6 - */ -public class EchoBaseTopiaConnectionProvider extends TopiaConnectionProvider { - - /** Logger. */ - private static final Log log = LogFactory.getLog(EchoBaseTopiaConnectionProvider.class); - - @Override - public void closeConnection(Connection conn) throws SQLException { - - // if connection is already closed, nothing has to be done - // we can't keep this connection (and can not be push in pool) - - if (conn.isClosed()) { - - if (log.isDebugEnabled()) { - log.debug("Connection [" + conn + - "] alreay closed!, will not use it any longer "); - } - return; - } - - - // connection was not closed, can push it in the pool (if pool is not - // full) - - synchronized (getPool()) { - int currentSize = getPool().size(); - if (currentSize < getPoolSize()) { - if (log.isTraceEnabled()) { - log.trace("returning connection to pool, pool size: " + - (currentSize + 1)); - } - - // make sure connection is always rollback before keep it - conn.rollback(); - - getPool().add(conn); - return; - } - } - - // pool was full, must release the connection which will be loose - - if (log.isDebugEnabled()) { - log.debug("closing JDBC connection"); - } - - conn.close(); - } -} Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties =================================================================== --- trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-04 14:04:32 UTC (rev 488) @@ -28,5 +28,4 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.username=sa hibernate.connection.password=sa -hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider -#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-04 14:04:32 UTC (rev 488) @@ -29,8 +29,8 @@ war.directory=${data.directory} -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase +#hibernate.dialect=org.hibernate.dialect.H2Dialect +#hibernate.connection.username=sa +#hibernate.connection.password=sa +#hibernate.connection.driver_class=org.h2.Driver +#hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-04 14:04:32 UTC (rev 488) @@ -26,9 +26,11 @@ import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.Transaction; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.web.filter.TopiaTransactionFilter; import javax.servlet.ServletRequest; @@ -71,6 +73,10 @@ * @since 1.9.1 */ protected void onCloseTransaction(TopiaContext transaction) { + closeConnection(transaction); + } + + public static void closeConnection(TopiaContext transaction) { if (transaction == null) { if (log.isTraceEnabled()) { log.trace("no transaction to close"); @@ -85,6 +91,13 @@ } try { + Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); + } + tx.rollback(); + } transaction.closeContext(); } catch (TopiaException e) { throw new TopiaRuntimeException(e); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-04-04 14:04:32 UTC (rev 488) @@ -26,6 +26,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; +import fr.ifremer.echobase.ui.EchoBaseTopiaTransactionFilter; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -96,7 +97,7 @@ } finally { try { - topiaContext.closeContext(); + EchoBaseTopiaTransactionFilter.closeConnection(topiaContext); } finally { closeAction(model); } Modified: trunk/echobase-ui/src/main/resources/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-04 14:04:32 UTC (rev 488) @@ -28,8 +28,7 @@ hibernate.hbm2ddl.auto=none hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider -#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase

1 0

r487 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 13:06:54 +0200 (Wed, 04 Apr 2012) New Revision: 487 Url: http://forge.codelutin.com/repositories/revision/echobase/487 Log: create version 0.6 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-entities/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-services/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-tools/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-ui/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> <modules> <module>echobase-entities</module>

1 0

r486 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 13:05:41 +0200 (Wed, 04 Apr 2012) New Revision: 486 Url: http://forge.codelutin.com/repositories/revision/echobase/486 Log: fixes #1084: Apr?\195?\168s un import en erreur, impossible d'en recommencer un Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java trunk/echobase-ui/src/main/resources/echobase.properties Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java 2012-04-04 11:05:41 UTC (rev 486) @@ -0,0 +1,87 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ +package fr.ifremer.echobase; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.framework.TopiaConnectionProvider; + +import java.sql.Connection; +import java.sql.SQLException; + +/** + * To fix roolback errors. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.6 + */ +public class EchoBaseTopiaConnectionProvider extends TopiaConnectionProvider { + + /** Logger. */ + private static final Log log = LogFactory.getLog(EchoBaseTopiaConnectionProvider.class); + + @Override + public void closeConnection(Connection conn) throws SQLException { + + // if connection is already closed, nothing has to be done + // we can't keep this connection (and can not be push in pool) + + if (conn.isClosed()) { + + if (log.isDebugEnabled()) { + log.debug("Connection [" + conn + + "] alreay closed!, will not use it any longer "); + } + return; + } + + + // connection was not closed, can push it in the pool (if pool is not + // full) + + synchronized (getPool()) { + int currentSize = getPool().size(); + if (currentSize < getPoolSize()) { + if (log.isTraceEnabled()) { + log.trace("returning connection to pool, pool size: " + + (currentSize + 1)); + } + + // make sure connection is always rollback before keep it + conn.rollback(); + + getPool().add(conn); + return; + } + } + + // pool was full, must release the connection which will be loose + + if (log.isDebugEnabled()) { + log.debug("closing JDBC connection"); + } + + conn.close(); + } +} Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties =================================================================== --- trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-03 15:04:16 UTC (rev 485) +++ trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-04 11:05:41 UTC (rev 486) @@ -28,4 +28,5 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.username=sa hibernate.connection.password=sa -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-03 15:04:16 UTC (rev 485) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-04 11:05:41 UTC (rev 486) @@ -61,4 +61,34 @@ throw new TopiaRuntimeException("Could not start transaction", eee); } } + + /** + * Hook method to close the topia transaction of the request at the end of + * the request when all filter has been consumed. + * + * @param transaction the transaction to close (can be null if transaction + * was not required while the current request) + * @since 1.9.1 + */ + protected void onCloseTransaction(TopiaContext transaction) { + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing transaction " + transaction); + } + + try { + transaction.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } } Modified: trunk/echobase-ui/src/main/resources/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-03 15:04:16 UTC (rev 485) +++ trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-04 11:05:41 UTC (rev 486) @@ -28,7 +28,8 @@ hibernate.hbm2ddl.auto=none hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase

1 0

r485 - trunk/echobase-services/src/main/resources/embedded
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 17:04:16 +0200 (Tue, 03 Apr 2012) New Revision: 485 Url: http://forge.codelutin.com/repositories/revision/echobase/485 Log: fixes #1081: Application embarqu?\195?\169e g?\195?\169n?\195?\169r?\195?\169 n'utilise pas (sous linux) le bon nom de war Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-04-03 14:16:47 UTC (rev 484) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-04-03 15:04:16 UTC (rev 485) @@ -3,6 +3,6 @@ cd `dirname $0` CURRENTPWD=`pwd` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" -java $ECHOBASE_OPTS -jar echobase-ui-0.4-SNAPSHOT.war $* +java $ECHOBASE_OPTS -jar echobase-ui-${project.version}.war $* cd "$OLDPWD"

1 0

r484 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: maven-release Date: 2012-04-03 16:16:47 +0200 (Tue, 03 Apr 2012) New Revision: 484 Url: http://forge.codelutin.com/repositories/revision/echobase/484 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-entities/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-services/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-tools/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-ui/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r483 - tags
by maven-release＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: maven-release Date: 2012-04-03 16:16:40 +0200 (Tue, 03 Apr 2012) New Revision: 483 Url: http://forge.codelutin.com/repositories/revision/echobase/483 Log: [maven-release-plugin] copy for tag echobase-0.5 Added: tags/echobase-0.5/

1 0

r482 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: maven-release Date: 2012-04-03 16:16:33 +0200 (Tue, 03 Apr 2012) New Revision: 482 Url: http://forge.codelutin.com/repositories/revision/echobase/482 Log: [maven-release-plugin] prepare release echobase-0.5 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-entities/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-services/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-tools/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-ui/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 </developerConnection> </scm>

1 0

r481 - trunk/echobase-services
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:14:00 +0200 (Tue, 03 Apr 2012) New Revision: 481 Url: http://forge.codelutin.com/repositories/revision/echobase/481 Log: optimize dependencies Modified: trunk/echobase-services/pom.xml Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-03 14:03:47 UTC (rev 480) +++ trunk/echobase-services/pom.xml 2012-04-03 14:14:00 UTC (rev 481) @@ -41,11 +41,6 @@ <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> -  <dependency>

1 0

r480 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:03:47 +0200 (Tue, 03 Apr 2012) New Revision: 480 Url: http://forge.codelutin.com/repositories/revision/echobase/480 Log: fixes #1051: Les dates lors d'un imports d'une table sont marqu?\195?\169es comme modifi?\195?\169es + utilisation i18n Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 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 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-04-03 14:03:47 UTC (rev 480) @@ -42,6 +42,7 @@ import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import org.nuiton.util.PagerUtil; import org.nuiton.util.beans.BeanMonitor; import org.nuiton.util.beans.PropertyDiff; @@ -51,12 +52,14 @@ import org.nuiton.util.csv.ImportableColumn; import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.web.struts2.FilterPagerUtil; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Map; +import static org.nuiton.i18n.I18n.l_; + /** * Service to edit the database. * @@ -92,7 +95,7 @@ //TODO Use an object to filter datas public Map<?, ?>[] getDatas(EchoBaseEntityEnum entityType, - FilterPagerUtil.FilterPagerBean pager, + TopiaFilterPagerUtil.FilterPagerBean pager, String sidx, Boolean ascendantOrder) { @@ -119,7 +122,7 @@ } public <E extends TopiaEntity> List<E> getEntities(TableMeta tableMeta, - FilterPagerUtil.FilterPagerBean pager, + TopiaFilterPagerUtil.FilterPagerBean pager, String sidx, Boolean ascendantOrder, String extraWhereQuery) { @@ -141,11 +144,11 @@ DecoratorService decoratorService = getDecoratorService(); // prepare the filter hql code - List<FilterPagerUtil.FilterRule> rules = pager.getRules(); + List<TopiaFilterPagerUtil.FilterRule> rules = pager.getRules(); List<String> strFilterRules = Lists.newLinkedList(); long timestamp = System.currentTimeMillis(); int index = 0; - for (FilterPagerUtil.FilterRule rule : rules) { + for (TopiaFilterPagerUtil.FilterRule rule : rules) { String ruleFilter; String field = rule.getField(); @@ -154,7 +157,7 @@ Preconditions.checkNotNull( columnMeta, "no property named " + columnMeta); - FilterPagerUtil.FilterOperation op = rule.getOp(); + TopiaFilterPagerUtil.FilterOperation op = rule.getOp(); String data = rule.getData(); String paramName = field + "_" + timestamp + (index++); String propertyName = "e." + field; @@ -211,7 +214,8 @@ } if (CollectionUtils.isNotEmpty(strFilterRules)) { - FilterPagerUtil.FilterOperationGroup groupOp = pager.getGroupOp(); + TopiaFilterPagerUtil.FilterOperationGroup groupOp = + pager.getGroupOp(); filterHql = StringUtils.join(strFilterRules, groupOp.name()); } } @@ -427,10 +431,12 @@ String topiaId = entity.getTopiaId(); buffer = new StringBuilder(messagePrefix).append('\n'); + Locale l = getLocale(); if (monitor == null) { // no monitor, means this is a creation of an object - buffer.append("Une entité a été crée d'identifiant ").append(topiaId); + buffer.append(l_( + l, "echobase.info.newEntityCreated", topiaId)); } else { PropertyDiff[] propertyDiffs = monitor.getPropertyDiffs(); @@ -444,12 +450,12 @@ } if (length == 1) { - buffer.append("Une propriété a été modifiée :"); + buffer.append(l_(l, "echobase.info.onePropertyModified")); } else { - buffer.append(length).append(" propriétés ont été modifiées :"); + buffer.append( + l_(l, "echobase.info.somePropertiesModified", length)); } - for (int i = 0; i < length; i++) { - PropertyDiff diff = propertyDiffs[i]; + for (PropertyDiff diff : propertyDiffs) { Object sourceValue = diff.getSourceValue(); Object targetValue = diff.getTargetValue(); @@ -461,18 +467,18 @@ // replace by the decorate value if (sourceValue != null) { sourceValue = getDecoratorService().decorate( - getLocale(), sourceValue, null); + l, sourceValue, null); } if (targetValue != null) { targetValue = getDecoratorService().decorate( - getLocale(), targetValue, null); + l, targetValue, null); } } - buffer.append(String.format("\n Propriété '%s', ancienne valeur : '%s', nouvelle valeur : '%s'", - propertyName, - sourceValue, - targetValue - )); + buffer.append("\n "); + buffer.append( + l_(l, "echobase.info.modifiedProperty", propertyName, + sourceValue, + targetValue)); } } @@ -577,10 +583,6 @@ propertyName + "_lib", propertyName, decorator -// EchobaseCsvUtil.newForeignKeyDecoratedValue( -// entityType, -// getDecoratorService(), -// getLocale()) ); } Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-03 14:03:47 UTC (rev 480) @@ -43,3 +43,6 @@ echobase.importError.no.voyage.imported= echobase.importError.transect.notfound= echobase.importError.transit.notfound= +echobase.info.modifiedProperty=Property '%s', old value\: '%s', new value\: '%s' +echobase.info.onePropertyModified=One property was modified\: +echobase.info.somePropertiesModified=%s properties were modified\: Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-03 14:03:47 UTC (rev 480) @@ -43,3 +43,7 @@ echobase.importError.no.voyage.imported=Aucun voyage importé echobase.importError.transect.notfound=Transit non trouvé pour la campagne %s et la date %s et le navire %s (ligne %s) echobase.importError.transit.notfound=Transit non trouvé pour la campagne %s et la date %s (ligne %s) +echobase.info.modifiedProperty=Propriété '%s', ancienne valeur \: '%s', nouvelle valeur \: '%s' +echobase.info.newEntityCreated=Une nouvelle entité a été créée %s +echobase.info.onePropertyModified=Une propriété a été modifiée \: +echobase.info.somePropertiesModified=%s propriétés ont été modifiées \: Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-04-03 14:03:47 UTC (rev 480) @@ -32,10 +32,15 @@ jQuery(document).ready(function () { $.addRowSelectTopic('datas', function (event) { + $('#extraInfos').show(); + var id = $("tr[aria-selected=true] td[aria-describedby='datas_entityId']").text(); + $('#modificationEntityId').html(id); + var text = $("tr[aria-selected=true] td[aria-describedby='datas_modificationText']").text(); $('#modificationTextContainter').html(text); }); $.addClearSelectTopic('datas', function (event) { + $('#extraInfos').hide(); $('#modificationTextContainter').html("${emptySelection}"); }); $.addEvenAndOddClasses('datas'); @@ -71,7 +76,16 @@ <br/> <fieldset> <legend><s:text name="echobase.title.modification.detail"/></legend> - <pre id='modificationTextContainter'></pre> + <div id="extraInfos"> + <s:label key='echobase.common.entityId' value=''/> + <div class="clearBoth"/> + <pre id='modificationEntityId' style="font-weight: bold;"></pre> + <br/> + </div> + <s:label key='echobase.common.modificationText' value=''/> + <div class="clearBoth"/> + <br/> + <pre id='modificationTextContainter' style="font-weight: bold;"></pre> </fieldset>

1 0