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

r613 - in trunk: . echobase-domain/src/main/resources/i18n echobase-services/src/main/resources/i18n echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb echobase-ui/src/main/webapp/WEB-INF/jsp/importData echobase-ui/src/main/webapp/WEB-INF/jsp/user
by tchemit＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 22:55:46 +0200 (Tue, 04 Sep 2012) New Revision: 613 Url: http://forge.codelutin.com/repositories/revision/echobase/613 Log: fixes #1016: Int?\195?\169grer les traductions anglaises Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 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/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/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp trunk/pom.xml 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 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-04 20:55:46 UTC (rev 613) @@ -1,11 +1,11 @@ -echobase.common.driverType.h2= -echobase.common.driverType.postgres= -echobase.config.csv.separator.description= -echobase.config.data.directory.description= -echobase.config.embedded.description= -echobase.config.h2Version.description= -echobase.config.internal.db.directory.description= -echobase.config.postgresqlVersion.description= -echobase.config.version.description= -echobase.config.war.location.description= +echobase.common.driverType.h2=H2 Database +echobase.common.driverType.postgres=Postgresql Database +echobase.config.csv.separator.description=Csv separator character +echobase.config.data.directory.description=Path to application data +echobase.config.embedded.description=Flag used for embedded application (will create a h2 working db configuration to access database) +echobase.config.h2Version.description=H2 jdbc driver version +echobase.config.internal.db.directory.description=Directory of the internal database +echobase.config.postgresqlVersion.description=Postgresql driver version +echobase.config.version.description=Application version +echobase.config.war.location.description=Location of the war used to create embedded applications echobase.configuration.description=EchoBase configuration 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-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-09-04 20:55:46 UTC (rev 613) @@ -1,50 +1,50 @@ -echobase.common.biometrySampleFile= -echobase.common.cellMapsFile= -echobase.common.cellPositionReference.end= -echobase.common.cellPositionReference.mid= -echobase.common.cellPositionReference.start= -echobase.common.cellRegionAssociationFile= -echobase.common.cellRegionResultFile= -echobase.common.cellRegionsFile= -echobase.common.commonDataImportMode.all= -echobase.common.commonDataImportMode.transect= -echobase.common.echotypeFile= -echobase.common.esduByEchotypeAndSpeciesCategoryFile= -echobase.common.esduByEchotypeFile= -echobase.common.esduBySpeciesAndAgeCategoryFile= -echobase.common.esduBySpeciesAndSizeCategoryFile= -echobase.common.gearMetadataFile= -echobase.common.importDbFile= -echobase.common.importMode.acoustic= -echobase.common.importMode.catches= -echobase.common.importMode.common= -echobase.common.importMode.operation= -echobase.common.importMode.results= -echobase.common.lengthAgeKeyFile= -echobase.common.lengthWeightKeyFile= -echobase.common.moviesFile= -echobase.common.operationFile= -echobase.common.operationMetadataFile= -echobase.common.resultsImportMode.esdu= -echobase.common.resultsImportMode.map= -echobase.common.resultsImportMode.region= -echobase.common.resultsImportMode.voyage= -echobase.common.subSampleFile= -echobase.common.totalSampleFile= -echobase.common.transectFile= -echobase.common.transitFile= -echobase.common.voyageFile= -echobase.importError.can.only.import.one.voyage.atime= -echobase.importError.dataMetadata.notFound= -echobase.importError.duplicate.sample= -echobase.importError.esduCell.notfound= -echobase.importError.fromFile= -echobase.importError.no.transit.between.date= -echobase.importError.no.voyage.imported= -echobase.importError.transect.notfound= -echobase.importError.transit.notfound= +echobase.common.biometrySampleFile=BiometrySample file +echobase.common.cellMapsFile=Map cells file +echobase.common.cellPositionReference.end=End +echobase.common.cellPositionReference.mid=Midpoint +echobase.common.cellPositionReference.start=Start +echobase.common.cellRegionAssociationFile=Region cells association file +echobase.common.cellRegionResultFile=Region cells results file +echobase.common.cellRegionsFile=Region cells file +echobase.common.commonDataImportMode.all=Voyage / Transit / Transects import +echobase.common.commonDataImportMode.transect=Transects import +echobase.common.echotypeFile=Echotypes file +echobase.common.esduByEchotypeAndSpeciesCategoryFile=Results per ESDU / echotype / species category file +echobase.common.esduByEchotypeFile=Results per ESDU / echotype file +echobase.common.esduBySpeciesAndAgeCategoryFile=Results per ESDU / species / age file +echobase.common.esduBySpeciesAndSizeCategoryFile=Results per ESDU / species / size file +echobase.common.gearMetadataFile=Gear metadata file +echobase.common.importDbFile=Import file (.zip) +echobase.common.importMode.acoustic=Acoustic data import +echobase.common.importMode.catches=Fishing data import +echobase.common.importMode.common=Voyage / Transit / Transect data import +echobase.common.importMode.operation=Operations data import +echobase.common.importMode.results=Results import +echobase.common.lengthAgeKeyFile=Size-age equations file +echobase.common.lengthWeightKeyFile=Size-weight equations file +echobase.common.moviesFile=Acoustic data file +echobase.common.operationFile=Operation data file +echobase.common.operationMetadataFile=Operation metadata file +echobase.common.resultsImportMode.esdu=Import the “ESDU” cells results +echobase.common.resultsImportMode.map=Import the “map” cells results +echobase.common.resultsImportMode.region=Import the “region” cells results +echobase.common.resultsImportMode.voyage=Import the voyage-related results +echobase.common.subSampleFile=SubSample file +echobase.common.totalSampleFile=TotalSample file +echobase.common.transectFile=Transect data file +echobase.common.transitFile=Transit data file +echobase.common.voyageFile=Voyage data file +echobase.importError.can.only.import.one.voyage.atime=Impossible to import more that one voyage at a time +echobase.importError.dataMetadata.notFound=Metadata column %s missing (existing values \:%s) +echobase.importError.duplicate.sample=Operation %s cannot comprise several samples of same type, species and size category +echobase.importError.esduCell.notfound=A new « dataAquisition» entry must be created for survey %s, vessel %s, instrument %s, whereas some elementary cells are not associated to an ESDU cell (line %s) +echobase.importError.fromFile=An error occured while importing file %s \:%s +echobase.importError.no.transit.between.date=No transit associated to voyage %s between dates %s and %s +echobase.importError.no.voyage.imported=No voyage imported +echobase.importError.transect.notfound=No parent transit for date %s and vessel %s in cruise %s (line %s) +echobase.importError.transit.notfound=No parent transit for date %s in cruise %s (line %s) echobase.importLabel.withFile=%s with file %s echobase.info.modifiedProperty=Property '%s', old value\: '%s', new value\: '%s' -echobase.info.newEntityCreated= -echobase.info.onePropertyModified=One property was modified\: -echobase.info.somePropertiesModified=%s properties were modified\: +echobase.info.newEntityCreated=A new entity was created (%s) +echobase.info.onePropertyModified=A property has been modified\: +echobase.info.somePropertiesModified=%s properties have been 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-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-09-04 20:55:46 UTC (rev 613) @@ -1,50 +1,50 @@ -echobase.common.biometrySampleFile=Fichier BiometrySample +echobase.common.biometrySampleFile=Fichier de biométries (BiometrySample) echobase.common.cellMapsFile=Fichier des cellules Cartes echobase.common.cellPositionReference.end=Fin echobase.common.cellPositionReference.mid=Milieu echobase.common.cellPositionReference.start=Début -echobase.common.cellRegionAssociationFile=Fichier d'associations de cellules Région +echobase.common.cellRegionAssociationFile=Fichier d'associations des cellules Région echobase.common.cellRegionResultFile=Fichier de résultats de cellules Région echobase.common.cellRegionsFile=Fichier des cellules Région echobase.common.commonDataImportMode.all=Import Voyage / Transit / Transects echobase.common.commonDataImportMode.transect=Import Transects -echobase.common.echotypeFile=Fichier echotype -echobase.common.esduByEchotypeAndSpeciesCategoryFile=Fichier ESDU / Echotype / Catégorie Espèce -echobase.common.esduByEchotypeFile=Fichier ESDU / Echotype -echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier ESDU / Espèce / Catégorie Age -echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier ESDU / Espèce / Catégorie Taille -echobase.common.gearMetadataFile=Fichier Méta-données d'engin +echobase.common.echotypeFile=Fichier des échotypes +echobase.common.esduByEchotypeAndSpeciesCategoryFile=Fichier de résultats par ESDU / échotype / catégorie d'espèce +echobase.common.esduByEchotypeFile=Fichier de résultats par ESDU / échotype +echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier de résultats par ESDU / espèce / âge +echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier de résultats par ESDU / espèce / taille +echobase.common.gearMetadataFile=Fichier de méta-données d'engin echobase.common.importDbFile=Fichier d'import (zip) echobase.common.importMode.acoustic=Import des données acoustiques echobase.common.importMode.catches=Import des données de pêche -echobase.common.importMode.common=Import Voyage / Transit / Transect +echobase.common.importMode.common=Import des données de Voyage / Transit / Transect echobase.common.importMode.operation=Import des opérations echobase.common.importMode.results=Import des résultats -echobase.common.lengthAgeKeyFile=Fichier de relation Taille-Age -echobase.common.lengthWeightKeyFile=Fichier de relation Taille-Poids -echobase.common.moviesFile=Fichier Movies -echobase.common.operationFile=Fichier Opérations -echobase.common.operationMetadataFile=Fichier Méta-données opération -echobase.common.resultsImportMode.esdu=Import des résultats de cellules de type esdu +echobase.common.lengthAgeKeyFile=Fichier des relations taille-âge +echobase.common.lengthWeightKeyFile=Fichier des relations taille-poids +echobase.common.moviesFile=Fichier des données acoustiques +echobase.common.operationFile=Fichier des données opérations +echobase.common.operationMetadataFile=Fichier des méta-données d'opérations +echobase.common.resultsImportMode.esdu=Import des résultats des cellules de type «ESDU” echobase.common.resultsImportMode.map=Import des cellules de type Carte echobase.common.resultsImportMode.region=Import des cellules de type Région echobase.common.resultsImportMode.voyage=Import des résultats du voyage -echobase.common.subSampleFile=Fichier SubSample -echobase.common.totalSampleFile=Fichier TotalSample -echobase.common.transectFile=Fichier des transects -echobase.common.transitFile=Fichier des transits -echobase.common.voyageFile=Fichier des voyages -echobase.importError.can.only.import.one.voyage.atime=Vous ne pouvez pas importer plus d'un voyage à la fois. -echobase.importError.dataMetadata.notFound=Une colonne de Metadata nommée %s non trouvée (valeurs existantes \: %s) -echobase.importError.duplicate.sample=L'opération %s ne peut pas contenir deux échantillons de même type %s, espèce %s et taille %s -echobase.importError.esduCell.notfound=Un nouveau dataAquisition pour la campagne %s, navire %s, instrument %s doit être crée mais il reste des cellules élémentaires non rattachées à une cellule ESDU (ligne %s) -echobase.importError.fromFile=Erreur lors de l'import du fichier %s \: %s -echobase.importError.no.transit.between.date=Pas de transit trouvé pour le voyage %s entre les dates %s et %s +echobase.common.subSampleFile=Fichier d'import des sous-échantillons (“SubSample”) +echobase.common.totalSampleFile=Fichier d'import des échantillons totaux (“ TotalSample”) +echobase.common.transectFile=Fichier des données de transects +echobase.common.transitFile=Fichier des données de transits +echobase.common.voyageFile=Fichier des données de voyages +echobase.importError.can.only.import.one.voyage.atime=Vous ne pouvez pas importer plus d'un voyage à la fois +echobase.importError.dataMetadata.notFound=Colonne de métadonnées nommée %s non trouvée (valeurs existantes \: %s) +echobase.importError.duplicate.sample=L'opération %s ne peut pas contenir deux échantillons de même type %s, espèce %s et classe de taille %s +echobase.importError.esduCell.notfound=Un nouvelle entrée « dataAquisition »doit être créée pour la campagne %s, navire %s, instrument %s, mais il reste des cellules élémentaires non rattachées à une cellule ESDU (ligne %s) +echobase.importError.fromFile=Erreur lors de l'importation du fichier %s \: %s +echobase.importError.no.transit.between.date=Pas de transit attribué au voyage %s entre les dates %s et %s 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.importError.transect.notfound=Pas de transit auquel rattacher la date %s et le navire %s dans la campagne %s (ligne %s) +echobase.importError.transit.notfound=Pas de transit auquel rattacher la date %s dans la campagne %s (ligne %s) echobase.importLabel.withFile=%s avec le fichier %s echobase.info.modifiedProperty=Propriété '%s', ancienne valeur \: '%s', nouvelle valeur \: '%s' -echobase.info.newEntityCreated=Une nouvelle entité à été créée (%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/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-04 20:55:46 UTC (rev 613) @@ -1,268 +1,270 @@ -echobase.action.backToUserList= +echobase.action.backToUserList=Back to users list echobase.action.cancel=Cancel -echobase.action.clone= -echobase.action.configureImport= -echobase.action.connectToWorkingDb= -echobase.action.create= -echobase.action.createEmbeddedApplication= -echobase.action.createMission= +echobase.action.clone=Clone +echobase.action.configureImport=Import configuration +echobase.action.connectToWorkingDb=Connect +echobase.action.create=Create +echobase.action.createEmbeddedApplication=Create a portable database +echobase.action.createMission=Create mission echobase.action.createNewMission=Create a new mission -echobase.action.createSqlQuery= -echobase.action.createWorkingDbConfiguration= -echobase.action.delete= -echobase.action.downloadEmbeddedApplicationFile= -echobase.action.downloadExportDbFile= -echobase.action.export= -echobase.action.exportSqlData= -echobase.action.exportTable= -echobase.action.generateSqlQuery=Generate request -echobase.action.import= -echobase.action.importTable= -echobase.action.login= -echobase.action.logout= -echobase.action.newLibreOfficeQuery=New Libre office request -echobase.action.newQuery=New request -echobase.action.newWorkingDbContiguration= -echobase.action.reloadSqlQuery= -echobase.action.reset= -echobase.action.return= -echobase.action.save= +echobase.action.createSqlQuery=Save +echobase.action.createWorkingDbConfiguration=Save +echobase.action.delete=Delete +echobase.action.downloadEmbeddedApplicationFile=Download the portable database +echobase.action.downloadExportDbFile=Download database export file +echobase.action.export=Export +echobase.action.exportSqlData=Data export +echobase.action.exportTable=Export +echobase.action.generateSqlQuery=Generate query +echobase.action.import=Import +echobase.action.importTable=Import +echobase.action.login=Connect +echobase.action.logout=Disconnect +echobase.action.newLibreOfficeQuery=New Libre Office query +echobase.action.newQuery=New query +echobase.action.newWorkingDbContiguration=New working database configuration +echobase.action.reloadSqlQuery=Reload +echobase.action.reset=Cancel +echobase.action.return=Back +echobase.action.save=Save echobase.action.saveSqlQuery=Update query -echobase.action.show.embedded.documentation=Show embedded application documentation -echobase.action.show.import.documentation=Show import documentation -echobase.action.toEnglish=Use english version -echobase.action.toFrench=Use the french version -echobase.action.usingEnglish=English version used -echobase.action.usingFrench=French version used +echobase.action.show.embedded.documentation=How to use a portable database +echobase.action.show.import.documentation=How to import data +echobase.action.toEnglish=English +echobase.action.toFrench=French +echobase.action.usingEnglish=English +echobase.action.usingFrench=French echobase.action.workingDbconfiguration.connect=Connect echobase.action.workingDbconfiguration.disconnect=Disconnect -echobase.action.workingDbconfiguration.downloadDriver=Télécharger le pilote jdbc -echobase.common.acousticDensityUnit= -echobase.common.acquisitionSoftwareVersionER60= -echobase.common.acquisitionSoftwareVersionME70= -echobase.common.addDataAcquisition= -echobase.common.admin= -echobase.common.areaOfOperation= -echobase.common.author= -echobase.common.authorEmail= -echobase.common.biometrySampleFile= -echobase.common.cellMapsFile= -echobase.common.cellPositionReference= -echobase.common.cellRegionAssociationFile= -echobase.common.cellRegionResultFile= -echobase.common.cellRegionsFile= -echobase.common.dataCentre= -echobase.common.dataCentreEmail= -echobase.common.dataProcessing= -echobase.common.dataProcessingNotes= -echobase.common.datum= -echobase.common.digitThreshold= -echobase.common.distributionStatement= -echobase.common.echotypeFile= -echobase.common.email= -echobase.common.entityId= -echobase.common.entityType= -echobase.common.esduByEchotypeAndSpeciesCategoryFile= -echobase.common.esduByEchotypeFile= -echobase.common.esduBySpeciesAndAgeCategoryFile= -echobase.common.esduBySpeciesAndSizeCategoryFile= -echobase.common.gearMetadataFile= -echobase.common.id= -echobase.common.importDataMode= -echobase.common.importDbFile= -echobase.common.importError=Message d'erreur -echobase.common.importMode= -echobase.common.importMode.acoustic= -echobase.common.importMode.catches= -echobase.common.importMode.common= -echobase.common.importMode.operation= -echobase.common.importMode.results= -echobase.common.importNotes= -echobase.common.importResult= -echobase.common.inProgress= -echobase.common.institution= -echobase.common.jdbcDriver=Jdbc Driver name -echobase.common.jdbcLogin= -echobase.common.jdbcPassword= -echobase.common.jdbcUrl= -echobase.common.keywords= -echobase.common.lastModifiedDate= -echobase.common.lastModifiedUser= -echobase.common.lengthAgeKeyFile= -echobase.common.lengthWeightKeyFile= -echobase.common.litteratureReferences= -echobase.common.loggedDataDatatype= -echobase.common.loggedDataFormat= -echobase.common.mission= -echobase.common.missionAbstract= -echobase.common.modificationDate= -echobase.common.modificationText= -echobase.common.modificationUser= -echobase.common.moviesFile= -echobase.common.name= -echobase.common.operationFile= -echobase.common.operationMetadataFile= -echobase.common.organisationLevelAcknowledgements= -echobase.common.organisationReferences= -echobase.common.password= +echobase.action.workingDbconfiguration.downloadDriver=Download jdbc driver +echobase.common.acousticDensityUnit=acousticDensityUnit +echobase.common.acquisitionSoftwareVersionER60=acquisitionSoftwareVersion (ER60 instrument) +echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 instrument) +echobase.common.addDataAcquisition=Always create new DataAcqusitions entries +echobase.common.admin=Administrator +echobase.common.areaOfOperation=AreaOfOperation +echobase.common.author=Author +echobase.common.authorEmail=Author email +echobase.common.biometrySampleFile=BiometrySample file +echobase.common.cellMapsFile=Map cells file +echobase.common.cellPositionReference=cellPositionReference +echobase.common.cellRegionAssociationFile=Region cells association file +echobase.common.cellRegionResultFile=Region cells results file +echobase.common.cellRegionsFile=Region cells file +echobase.common.dataCentre=Data center +echobase.common.dataCentreEmail=Data center email +echobase.common.dataProcessing=DataProcessing +echobase.common.dataProcessingNotes=Data processing notes +echobase.common.datum=Datum +echobase.common.digitThreshold=Digitization threshold +echobase.common.distributionStatement=Distribution statement +echobase.common.echotypeFile=Echotypes file +echobase.common.email=E-mail +echobase.common.entityId=ID +echobase.common.entityType=Entity type +echobase.common.esduByEchotypeAndSpeciesCategoryFile=Results per ESDU / echotype / species category file +echobase.common.esduByEchotypeFile=Results per ESDU / echotype file +echobase.common.esduBySpeciesAndAgeCategoryFile=Results per ESDU / species / age file +echobase.common.esduBySpeciesAndSizeCategoryFile=Results per ESDU / species / size file +echobase.common.gearMetadataFile=Gear metadata file +echobase.common.id=ID +echobase.common.importDataMode=Import type +echobase.common.importDbFile=Import file (.zip) +echobase.common.importError=Error\: +echobase.common.importMode=Import type +echobase.common.importMode.acoustic=Acoustic data import +echobase.common.importMode.catches=Fishing data import +echobase.common.importMode.common=Voyage / Transit / Transect data import +echobase.common.importMode.operation=Operations data import +echobase.common.importMode.results=Results import +echobase.common.importNotes=Import notes +echobase.common.importResult=Import results +echobase.common.inProgress=Processing... +echobase.common.institution=Institution +echobase.common.jdbcDriver=Jdbc driver name +echobase.common.jdbcLogin=Login +echobase.common.jdbcPassword=Password +echobase.common.jdbcUrl=Connection URL +echobase.common.keywords=Keywords +echobase.common.lastModifiedDate=Last modified date +echobase.common.lastModifiedUser=Last modified user +echobase.common.lengthAgeKeyFile=Size-age equations file +echobase.common.lengthWeightKeyFile=Size-weight equations file +echobase.common.litteratureReferences=References +echobase.common.loggedDataDatatype=loggedDataDatatype +echobase.common.loggedDataFormat=loggedDataFormat +echobase.common.mission=Mission +echobase.common.missionAbstract=Mission abstract +echobase.common.modificationDate=Last modified date +echobase.common.modificationText=Last modification +echobase.common.modificationUser=User +echobase.common.moviesFile=Acoustic data file +echobase.common.name=Name +echobase.common.operationFile=Operation data file +echobase.common.operationMetadataFile=Operation metadata file +echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements +echobase.common.organisationReferences=Organisation contact +echobase.common.password=Password echobase.common.pilotVersion=Jdbc pilot version -echobase.common.pingDutyCycle= -echobase.common.platform= -echobase.common.principalInvestigator= -echobase.common.principalInvestigatorEmail= -echobase.common.processingDescription= -echobase.common.processingTemplate= -echobase.common.project= -echobase.common.resultLabel=Result label -echobase.common.soundSpeedCalculationsER60= -echobase.common.soundSpeedCalculationsME70= -echobase.common.sounderConstant= -echobase.common.source= -echobase.common.subSampleFile= -echobase.common.tableDatas= -echobase.common.totalSampleFile= -echobase.common.transceiverAcquisitionAbsorptionDescription= -echobase.common.transectBinUnitsPingAxis= -echobase.common.transectFile= -echobase.common.transectGeospatialVerticalPositive= -echobase.common.transectLicence= -echobase.common.transitFile= -echobase.common.transitRelatedActivity= -echobase.common.user= -echobase.common.vessel= -echobase.common.voyage= -echobase.common.voyageDescription= -echobase.common.voyageFile= -echobase.confirm.delete.query=Confirm to delete export query -echobase.confirm.delete.workingDbConfiguration= -echobase.error.bad.password=Bad password -echobase.error.email.already.used=Email already used -echobase.error.invalid.sql=Invalid request \: %s -echobase.error.login.unknown=Unkwon login -echobase.error.mission.name.already.exist=Mission name already exists -echobase.error.no.embeddedApplication.configurationFound= -echobase.error.no.embeddedApplication.exportFileFound= -echobase.error.no.exportDb.configurationFound= -echobase.error.no.exportDb.exportFileFound= -echobase.error.query.name.already.exists=Query name already used -echobase.error.required.email=Email is required +echobase.common.pingDutyCycle=pingDutyCycle +echobase.common.platform=Platform +echobase.common.principalInvestigator=Researcher +echobase.common.principalInvestigatorEmail=Researcher e-mail +echobase.common.processingDescription=Data processing description +echobase.common.processingTemplate=Data processing template +echobase.common.project=Project +echobase.common.resultLabel=Results label +echobase.common.soundSpeedCalculationsER60=Sound speed calculations method (ER60 instrument) +echobase.common.soundSpeedCalculationsME70=Sound speed calculation method (ME70 instrument) +echobase.common.sounderConstant=Sounder constant (if relevant) +echobase.common.source=Source +echobase.common.subSampleFile=SubSample file +echobase.common.totalSampleFile=TotalSample file +echobase.common.transceiverAcquisitionAbsorptionDescription=Transceiver absorption coefficient computation method (data acquisition) +echobase.common.transectBinUnitsPingAxis=Bin units along the ping axis (transect) +echobase.common.transectFile=Transect data file +echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) +echobase.common.transectLicence=Data license (transect) +echobase.common.transitFile=Transit data file +echobase.common.transitRelatedActivity=Transit related activities +echobase.common.user=User +echobase.common.vessel=Vessel +echobase.common.voyage=Cruise +echobase.common.voyageDescription=Description +echobase.common.voyageFile=Voyage data file +echobase.confirm.delete.query=Delete query +echobase.confirm.delete.workingDbConfiguration=Delete working database configuration +echobase.error.bad.password=Invalid password +echobase.error.email.already.used=The user name already exists +echobase.error.invalid.sql=Invalid query\: %s +echobase.error.login.unknown=Unkwown user +echobase.error.mission.name.already.exist=The mission name already exists +echobase.error.no.embeddedApplication.configurationFound=Portable database configuration not found +echobase.error.no.embeddedApplication.exportFileFound=New portable database not found +echobase.error.no.exportDb.configurationFound=Database export configuration not found +echobase.error.no.exportDb.exportFileFound=Database export archive not found +echobase.error.query.name.already.exists=Query name already exists +echobase.error.required.email=E-mail address required echobase.error.required.password=Password is required -echobase.error.warlocation.notFound=War not found at location %s -echobase.error.workingDbConfiguration.couldNotConnect= -echobase.error.workingDbConfiguration.description.required= -echobase.error.workingDbConfiguration.login.required= -echobase.error.workingDbConfiguration.url.already.exists= -echobase.error.workingDbConfiguration.url.required= -echobase.header.request.result= -echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) -echobase.info.dbeditor.propertyDiffsResult= -echobase.info.downloadEchoBase=Téléchargement de l'application et des fichiers d'import -echobase.info.echoBaseForge=Gestion du projet -echobase.info.import.failed=L'import a échoué. -echobase.info.import.succeded= -echobase.info.lastDevDocumentation=Documentation en cours (disponible dans la prochaine version stable) -echobase.info.lastStableDocumentation=Documentation de la dernière version stable -echobase.info.new.sqlQuery.inprogress=New query creation in progress -echobase.info.new.workingDbConfiguration.inprogress= -echobase.info.no.sqlQuery.saved= -echobase.info.no.sqlQuery.selected= -echobase.info.no.table.selected= -echobase.info.no.voyagee.found= -echobase.info.no.workingDbConfiguration.saved= -echobase.info.no.workingDbConfiguration.selected= -echobase.info.sqlQuery.not.modifiable=Current user can not udate the selected query -echobase.info.usefulLinks=Quelques liens utiles -echobase.info.user.create= -echobase.info.user.delete= -echobase.info.user.update= -echobase.info.workingDbconfiguration.connected= -echobase.info.workingDbconfiguration.created= -echobase.info.workingDbconfiguration.deleted= -echobase.info.workingDbconfiguration.disconnected= -echobase.information.mission.created= -echobase.information.one.file.required= -echobase.label.admin.user.create= -echobase.label.admin.user.delete= -echobase.label.admin.user.edit= -echobase.label.createIfNotFound= -echobase.label.driverType= -echobase.label.embeddedApplicationFileName= -echobase.label.embeddedWarFileName= -echobase.label.exportAsSeen=Export as seen on screen -echobase.label.exportDbFileName= -echobase.label.exportFileName= -echobase.label.importFile= -echobase.label.login= -echobase.label.noWorkingDbSelected= -echobase.label.numberOfCreatedEntities= -echobase.label.numberOfUpdatedEntities= -echobase.label.query.description= -echobase.label.query.name= -echobase.label.query.sql= -echobase.label.sqlQueries= -echobase.label.user.login= -echobase.label.voyageToSelect= -echobase.label.workingDbConfiguration.description= -echobase.label.workingDbConfiguration.login= -echobase.label.workingDbConfiguration.password= -echobase.label.workingDbConfiguration.url= -echobase.label.workingDbConfigurations= -echobase.label.workingDbSelected= -echobase.legend.connectionToDb.detail= -echobase.legend.dbeditor.edit= -echobase.legend.dbeditor.show=Detail of '%s' -echobase.legend.embeddedApplication.configuration= -echobase.legend.exportDb.configuration.files= -echobase.legend.importData.configuration.selectImportType= -echobase.legend.importData.configure= -echobase.legend.importData.result.resume=Résultat -echobase.legend.importDb.configuration.files= -echobase.legend.libreOfficeQuery=Requète "libre office" -echobase.legend.sqlQuery.configuration= -echobase.legend.sqlQuery.result= -echobase.legend.workingDbConfiguration.create= -echobase.legend.workingDbConfiguration.use= -echobase.menu.connectToDbInformations= -echobase.menu.createEmbeddedApplication= -echobase.menu.editData=Modify datas -echobase.menu.export= -echobase.menu.exportDb= -echobase.menu.importData= -echobase.menu.importDb= -echobase.menu.logs= -echobase.menu.users= -echobase.menu.viewData=view datas -echobase.message.no.row.selected= -echobase.message.noEntrySelection= -echobase.message.warnEmbeddedApplicationInProgress= -echobase.message.warnExportInProgress= -echobase.message.warnImportInProgress= -echobase.title.confirm.deleteQuery=Delete a export query -echobase.title.confirm.deleteWorkingDbConfiguration= -echobase.title.connectToDbInformations= -echobase.title.createEmbeddedApplication= -echobase.title.createMission= -echobase.title.dbEditor= -echobase.title.dbEditor.read=Visualisation des données -echobase.title.embeddedApplicationProgress= -echobase.title.embeddedApplicationResult= -echobase.title.entityModificationLogs= -echobase.title.export= -echobase.title.exportDb= -echobase.title.exportDbProgress= -echobase.title.exportDbResult= -echobase.title.exportTable= -echobase.title.importData.selectImportType= -echobase.title.importDb= -echobase.title.importDbProgress= -echobase.title.importDbResult= -echobase.title.importTable= -echobase.title.login= -echobase.title.modification.detail= -echobase.title.newLibreOfficeQuery=Import a new "Libre-Office" request -echobase.title.users= -echobase.title.welcome= -echobase.title.workingDbConfiguration= -echobase.tooltip.disconnectWorkingDb= -echobase.tooltip.logout= -echobase.tooltip.selectWorkingDb= +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.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 +echobase.info.click.to.select=You can select value with a simple click then copy it (Ctrl-C) +echobase.info.dbeditor.propertyDiffsResult=Data import results +echobase.info.downloadEchoBase=Download application and import files +echobase.info.echoBaseForge=Project Forge +echobase.info.exportDb.archive=Basebame of the archive, extension <strong>.zip</strong> will be added to it. +echobase.info.import.failed=Import failed +echobase.info.import.succeded=Successful import +echobase.info.lastDevDocumentation=Current documentation (will be available at next stable version) +echobase.info.lastStableDocumentation=Last stable version documentation +echobase.info.new.sqlQuery.inprogress=Query creation in progress +echobase.info.new.workingDbConfiguration.inprogress=New working database configuration in progress +echobase.info.no.sqlQuery.saved=No saved SQL query +echobase.info.no.sqlQuery.selected=No SQL query selected +echobase.info.no.table.selected=No table selected +echobase.info.no.voyagee.found=No survey selected +echobase.info.no.workingDbConfiguration.saved=No working database configuration saved +echobase.info.no.workingDbConfiguration.selected=Select a working database configuration and then connect +echobase.info.sqlQuery.not.modifiable=You have not sufficient rights to update the selected query +echobase.info.update.user.password=Keep empty password field to not modify it. +echobase.info.usefulLinks=Some useful links +echobase.info.user.create=User %s created +echobase.info.user.delete=User %s deleted +echobase.info.user.update=User %s updated +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 +echobase.info.workingDbconfiguration.disconnected=Disconnected from working database '%s' +echobase.information.mission.created=Mission %s created +echobase.information.one.file.required=Please provide at least one import file +echobase.label.admin.user.create=User creation in process +echobase.label.admin.user.delete=Deleting user +echobase.label.admin.user.edit=Updating user +echobase.label.createIfNotFound=Create the entities not found in the database +echobase.label.driverType=Database type +echobase.label.embeddedApplicationFileName=Name of the compressed file to be uploaded +echobase.label.embeddedWarFileName=Name of the compressed file to be used +echobase.label.exportAsSeen=Export as displayed on the screen +echobase.label.exportDbFileName=Name of export file +echobase.label.exportFileName=Name of export file +echobase.label.importFile=File to export +echobase.label.login=Connection +echobase.label.noWorkingDbSelected=No working database selected +echobase.label.numberOfCreatedEntities=No. of fields created +echobase.label.numberOfUpdatedEntities=No. of fields updated +echobase.label.query.description=Description +echobase.label.query.name=Name +echobase.label.query.sql=SQL +echobase.label.sqlQueries=Saved queries +echobase.label.user.login=User\: %s +echobase.label.voyageToSelect=Voyage to be exported +echobase.label.workingDbConfiguration.description=Description +echobase.label.workingDbConfiguration.login=Login +echobase.label.workingDbConfiguration.password=Password +echobase.label.workingDbConfiguration.url=connection url +echobase.label.workingDbConfigurations=Working databases saved +echobase.label.workingDbSelected=Working database selected <strong>%s</strong> +echobase.legend.connectionToDb.detail=Database connection detailed information +echobase.legend.dbeditor.edit=Editing '%s' +echobase.legend.dbeditor.show=Displaying '%s' +echobase.legend.embeddedApplication.configuration=Portable database configuration +echobase.legend.exportDb.configuration.files=Export configuration +echobase.legend.importData.configuration.selectImportType=Type of import selection +echobase.legend.importData.configure=Import configuration +echobase.legend.importData.createMission=Mission caracteristics +echobase.legend.importData.result.resume=Results +echobase.legend.importDb.configuration.files=Import file selection (.zip file) +echobase.legend.libreOfficeQuery=Translate a SQL query from Libre Office +echobase.legend.sqlQuery.configuration=Query definition +echobase.legend.sqlQuery.result=Query results +echobase.legend.workingDbConfiguration.create=Create a working database configuration +echobase.legend.workingDbConfiguration.use=Working datbase configuration +echobase.menu.connectToDbInformations=Database connection information +echobase.menu.createEmbeddedApplication=Create a portable database +echobase.menu.editData=Modify data +echobase.menu.export=Export data +echobase.menu.exportDb=Complete database export +echobase.menu.importData=Import data +echobase.menu.importDb=Complete database import +echobase.menu.logs=Change log +echobase.menu.users=Manage users +echobase.menu.viewData=Display data +echobase.message.no.row.selected=No data selected +echobase.message.noEntrySelection=No field selected +echobase.message.warnEmbeddedApplicationInProgress=Please do not close the window to access the new portable database file +echobase.message.warnExportInProgress=Please do not close the window to access the export file +echobase.message.warnImportInProgress=Please do not close the window to access the imported file +echobase.title.confirm.deleteQuery=Delete a query +echobase.title.confirm.deleteWorkingDbConfiguration=Delete a configuration +echobase.title.connectToDbInformations=Database connection information +echobase.title.createEmbeddedApplication=Create a portable database +echobase.title.createMission=Create a mission +echobase.title.dbEditor=Modify data +echobase.title.dbEditor.read=Data display +echobase.title.embeddedApplicationProgress=Creating the portable database +echobase.title.embeddedApplicationResult=Results of the portable database creation +echobase.title.entityModificationLogs=Change log +echobase.title.export=SQL export +echobase.title.exportDb=Export a complete database +echobase.title.exportDbProgress=Export the current database +echobase.title.exportDbResult=Complete database export results +echobase.title.exportTable=Export a table +echobase.title.importData.selectImportType=Select type of import +echobase.title.importDb=Complete database import +echobase.title.importDbProgress=Importing data +echobase.title.importDbResult=Data import results +echobase.title.importTable=Import a table +echobase.title.login=Connection +echobase.title.modification.detail=Modification details +echobase.title.newLibreOfficeQuery=Translate a SQL query from Libre Office +echobase.title.users=Administrate users +echobase.title.welcome=Welcome to Echobase +echobase.title.workingDbConfiguration=Manage working database configurations +echobase.tooltip.disconnectWorkingDb=Change working database +echobase.tooltip.logout=Logout +echobase.tooltip.selectWorkingDb=Select a working database 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 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-04 20:55:46 UTC (rev 613) @@ -9,87 +9,87 @@ echobase.action.createNewMission=Créer une nouvelle mission echobase.action.createSqlQuery=Enregistrer echobase.action.createWorkingDbConfiguration=Enregistrer -echobase.action.delete=Supprimer +echobase.action.delete=Suppression 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 +echobase.action.downloadExportDbFile=Télécharger le fichier d'export de la base complète echobase.action.export=Exporter echobase.action.exportSqlData=Exporter les données echobase.action.exportTable=Exporter -echobase.action.generateSqlQuery=Générer la requète +echobase.action.generateSqlQuery=Générer la requête echobase.action.import=Importer echobase.action.importTable=Importer echobase.action.login=Connexion echobase.action.logout=Déconnexion -echobase.action.newLibreOfficeQuery=Nouvelle requète Libre office -echobase.action.newQuery=Nouvelle requète +echobase.action.newLibreOfficeQuery=Nouvelle requête Libre Office +echobase.action.newQuery=Nouvelle requête echobase.action.newWorkingDbContiguration=Nouvelle configuration de base de travail echobase.action.reloadSqlQuery=Recharger echobase.action.reset=Annuler echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Mettre à jour -echobase.action.show.embedded.documentation=Accéder à la documentation d'utilisation d'une application emabrquée -echobase.action.show.import.documentation=Accéder à la documentation de l'import -echobase.action.toEnglish=Utiliser la version anglaise -echobase.action.toFrench=Utiliser la version française -echobase.action.usingEnglish=Version anglaise utilisée -echobase.action.usingFrench=Version française utilisée +echobase.action.show.embedded.documentation=Comment utiliser une application embarquée +echobase.action.show.import.documentation=Comment importer des données +echobase.action.toEnglish=En anglais +echobase.action.toFrench=En français +echobase.action.usingEnglish=Version anglaise +echobase.action.usingFrench=Version française echobase.action.workingDbconfiguration.connect=Sélectionner une base de travail echobase.action.workingDbconfiguration.disconnect=Se déconnecter echobase.action.workingDbconfiguration.downloadDriver=Télécharger le pilote jdbc -echobase.common.acousticDensityUnit=acousticDensityUnit -echobase.common.acquisitionSoftwareVersionER60=acquisitionSoftwareVersion (ER60 instrument) -echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 instrument) -echobase.common.addDataAcquisition=Toujours créer des DataAcqusitions +echobase.common.acousticDensityUnit=Unité des densités acoustiques +echobase.common.acquisitionSoftwareVersionER60=Version du logiciel d'acquisition ER60 +echobase.common.acquisitionSoftwareVersionME70=Version du logiciel d'acquisition ME70 +echobase.common.addDataAcquisition=Toujours créer de nouvelles entrées DataAcqusitions echobase.common.admin=Administrateur -echobase.common.areaOfOperation=AreaOfOperation +echobase.common.areaOfOperation=Zone d'activités echobase.common.author=Auteur echobase.common.authorEmail=Courriel de l'auteur -echobase.common.biometrySampleFile= -echobase.common.cellMapsFile= -echobase.common.cellPositionReference=cellPositionReference -echobase.common.cellRegionAssociationFile= -echobase.common.cellRegionResultFile= -echobase.common.cellRegionsFile= +echobase.common.biometrySampleFile=Fichier de biométries (BiometrySample) +echobase.common.cellMapsFile=Fichier des cellules Cartes +echobase.common.cellPositionReference=Référentiel géographique des cellules des cartes +echobase.common.cellRegionAssociationFile=Fichier d'associations des cellules Région +echobase.common.cellRegionResultFile=Fichier de résultats de cellules Région +echobase.common.cellRegionsFile=Fichier des cellules Région echobase.common.dataCentre=Centre de données echobase.common.dataCentreEmail=Courriel du centre de données echobase.common.dataProcessing=DataProcessing -echobase.common.dataProcessingNotes=dataProcessingNotes -echobase.common.datum=Datum -echobase.common.digitThreshold=digitThreshold -echobase.common.distributionStatement=distributionStatement -echobase.common.echotypeFile= +echobase.common.dataProcessingNotes=Notes sur le pré-traitement des données +echobase.common.datum=Référenciel +echobase.common.digitThreshold=Seuil de numérisation +echobase.common.distributionStatement=Conditions de diffusion des données +echobase.common.echotypeFile=Fichier des échotypes echobase.common.email=Courriel echobase.common.entityId=Identifiant de l'entité -echobase.common.entityType=Type de l'entité -echobase.common.esduByEchotypeAndSpeciesCategoryFile= -echobase.common.esduByEchotypeFile= -echobase.common.esduBySpeciesAndAgeCategoryFile= -echobase.common.esduBySpeciesAndSizeCategoryFile= -echobase.common.gearMetadataFile= +echobase.common.entityType=Type d'entité +echobase.common.esduByEchotypeAndSpeciesCategoryFile=Fichier de résultats par ESDU / échotype / catégorie d'espèce +echobase.common.esduByEchotypeFile=Fichier de résultats par ESDU / échotype +echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier de résultats par ESDU / espèce / âge +echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier de résultats par ESDU / espèce / taille +echobase.common.gearMetadataFile=Fichier de méta-données d'engin echobase.common.id=Identifiant echobase.common.importDataMode=Type d'import -echobase.common.importDbFile= -echobase.common.importError=Un erreur est survenue pendant l'import \: +echobase.common.importDbFile=Fichier d'import (zip) +echobase.common.importError=Une erreur est survenue pendant l'import \: echobase.common.importMode=Type d'import -echobase.common.importMode.acoustic= -echobase.common.importMode.catches= -echobase.common.importMode.common= -echobase.common.importMode.operation= -echobase.common.importMode.results= +echobase.common.importMode.acoustic=Import des données acoustiques +echobase.common.importMode.catches=Import des données de pêche +echobase.common.importMode.common=Import des données de Voyage / Transit / Transect +echobase.common.importMode.operation=Import des opérations +echobase.common.importMode.results=Import des résultats echobase.common.importNotes=Remarques sur l'import echobase.common.importResult=Résultat de l'import -echobase.common.inProgress=en cours... +echobase.common.inProgress=En cours... echobase.common.institution=Institution echobase.common.jdbcDriver=Nom du pilote jdbc echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe -echobase.common.jdbcUrl=Url de connexion -echobase.common.keywords=Môts clefs +echobase.common.jdbcUrl=URL de connexion +echobase.common.keywords=Mots clefs echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification -echobase.common.lengthAgeKeyFile= -echobase.common.lengthWeightKeyFile= +echobase.common.lengthAgeKeyFile=Fichier des relations taille-âge +echobase.common.lengthWeightKeyFile=Fichier des relations taille-poids echobase.common.litteratureReferences=Références echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat @@ -98,81 +98,82 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur -echobase.common.moviesFile= +echobase.common.moviesFile=Fichier des données acoustiques echobase.common.name=Nom -echobase.common.operationFile= -echobase.common.operationMetadataFile= +echobase.common.operationFile=Fichier des données opérations +echobase.common.operationMetadataFile=Fichier des méta-données d'opérations echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements -echobase.common.organisationReferences=Références organisation +echobase.common.organisationReferences=Références de l'organisation echobase.common.password=Mot de passe echobase.common.pilotVersion=Version du pilote jdbc echobase.common.pingDutyCycle=pingDutyCycle -echobase.common.platform=Platform +echobase.common.platform=Plate-forme echobase.common.principalInvestigator=Chercheur echobase.common.principalInvestigatorEmail=Courriel du chercheur -echobase.common.processingDescription=processingDescription -echobase.common.processingTemplate=processingTemplate +echobase.common.processingDescription=Description de la méthode de pré-traitement des données +echobase.common.processingTemplate=Intitulé de la méthode de pré-traitement des données echobase.common.project=Projet -echobase.common.resultLabel=Result label -echobase.common.soundSpeedCalculationsER60=soundSpeedCalculations (ER60 instrument) -echobase.common.soundSpeedCalculationsME70=soundSpeedCalculations (ME70 instrument) -echobase.common.sounderConstant=sounderConstant +echobase.common.resultLabel=Intitulé des résultats +echobase.common.soundSpeedCalculationsER60=Méthode de calcul de la célérité du son (ER60) +echobase.common.soundSpeedCalculationsME70=Méthode de calcul de la célérité du son (ME70) +echobase.common.sounderConstant=Constante sondeur (si besoin) echobase.common.source=Source -echobase.common.subSampleFile= -echobase.common.tableDatas= -echobase.common.totalSampleFile= -echobase.common.transceiverAcquisitionAbsorptionDescription=transceiverAcquisitionAbsorptionDescription -echobase.common.transectBinUnitsPingAxis=BinUnitsPingAxis (transect) -echobase.common.transectFile= -echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) -echobase.common.transectLicence=Licence (transect) -echobase.common.transitFile= -echobase.common.transitRelatedActivity=RelatedActivity (transit) +echobase.common.subSampleFile=Fichier d'import des sous-échantillons (“SubSample”) +echobase.common.totalSampleFile=Fichier d'import des échantillons totaux (“TotalSample”) +echobase.common.transceiverAcquisitionAbsorptionDescription=Méthode de calcul du coefficient d'absorption pour l'acquisition des données +echobase.common.transectBinUnitsPingAxis=Unité de la dimension horizontale des ESDU +echobase.common.transectFile=Fichier des données de transects +echobase.common.transectGeospatialVerticalPositive=Direction de l'axe vertical des profondeurs (transect) +echobase.common.transectLicence=Licence pour la diffusion des données (transect) +echobase.common.transitFile=Fichier des données de transits +echobase.common.transitRelatedActivity=Travaux réalisés pendant le transit echobase.common.user=Utilisateur echobase.common.vessel=Navire echobase.common.voyage=Campagne echobase.common.voyageDescription=Description -echobase.common.voyageFile= -echobase.confirm.delete.query=Confirmer la suppression de la requète suivante +echobase.common.voyageFile=Fichier des données de voyages +echobase.confirm.delete.query=Confirmer la suppression de la requête echobase.confirm.delete.workingDbConfiguration=Confirmer la suppression de la configuration suivante -echobase.error.bad.password=Mot de passe incorrrect -echobase.error.email.already.used=Nom d'utilisateur déjà pris -echobase.error.invalid.sql=Requète non valide \: %s +echobase.error.bad.password=Mot de passe incorrect +echobase.error.email.already.used=Nom d'utilisateur déjà utilisé +echobase.error.invalid.sql=Requête non valide \: %s echobase.error.login.unknown=Utilisateur inconnu echobase.error.mission.name.already.exist=Nom de mission déjà utilisé -echobase.error.no.embeddedApplication.configurationFound=La configuration de création d'application embarquée non trouvée -echobase.error.no.embeddedApplication.exportFileFound=L'application embarquée générée non trouvée -echobase.error.no.exportDb.configurationFound=La configuration de l'export de la base non trouvée -echobase.error.no.exportDb.exportFileFound=L'archive d'export de la base non trouvée -echobase.error.query.name.already.exists=Nom de requète déjà utilisé -echobase.error.required.email=L'email est obligatoire +echobase.error.no.embeddedApplication.configurationFound=Configuration de création d'application embarquée non trouvée +echobase.error.no.embeddedApplication.exportFileFound=Application embarquée générée non trouvée +echobase.error.no.exportDb.configurationFound=Configuration de l'export de la base non trouvée +echobase.error.no.exportDb.exportFileFound=Archive d'export de la base introuvable +echobase.error.query.name.already.exists=Nom de requête déjà utilisé +echobase.error.required.email=Courriel obligatoire echobase.error.required.password=Le mot de passe est obligatoire -echobase.error.warlocation.notFound=L'application n'a pas été trouvé à l'emplacement suivant %s +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.description.required=Description obligatoire echobase.error.workingDbConfiguration.login.required=Login obligatoire -echobase.error.workingDbConfiguration.url.already.exists=Une connexion existe déjà avec cette url -echobase.error.workingDbConfiguration.url.required=Url obligatoire -echobase.header.request.result=Résultat de la requète sql +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 echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données echobase.info.downloadEchoBase=Téléchargement de l'application et des fichiers d'import echobase.info.echoBaseForge=Gestion du projet -echobase.info.import.failed=L'import a échoué. -echobase.info.import.succeded=L'import a réussi. +echobase.info.exportDb.archive=Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> sera automatiquement rajoutée. +echobase.info.import.failed=L'import a échoué +echobase.info.import.succeded=L'import a réussi echobase.info.lastDevDocumentation=Documentation en cours (disponible dans la prochaine version stable) echobase.info.lastStableDocumentation=Documentation de la dernière version stable -echobase.info.new.sqlQuery.inprogress=Nouvelle requète en cours de création +echobase.info.new.sqlQuery.inprogress=Nouvelle requête en cours de création echobase.info.new.workingDbConfiguration.inprogress=Nouvelle configuration de base de travail en cours de création -echobase.info.no.sqlQuery.saved=Aucune requète d'export sql enregistrée -echobase.info.no.sqlQuery.selected=Aucune requète d'export sql sélectionnée +echobase.info.no.sqlQuery.saved=Aucune requête d'export SQL enregistrée +echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter echobase.info.no.workingDbConfiguration.saved=Aucune configuration de base de travail enregistrée echobase.info.no.workingDbConfiguration.selected=Sélectionner une configuration pour ensuite vous y connecter -echobase.info.sqlQuery.not.modifiable=Vous ne pouvez pas modifier la requète sélectionnée +echobase.info.sqlQuery.not.modifiable=Vous ne disposez pas des droits nécessaires pour modifier la requête sélectionnée +echobase.info.update.user.password=Pour ne pas modifier le mot de passe laisser ce champs vide. echobase.info.usefulLinks=Quelques liens utiles -echobase.info.user.create=L'utilisateur '%s' a été créée +echobase.info.user.create=L'utilisateur '%s' a été créé echobase.info.user.delete=L'utilisateur '%s' a été supprimé echobase.info.user.update=L'utilisateur '%s' a été mis à jour echobase.info.workingDbconfiguration.connected=Connexion à la base de travail '%s' réussie @@ -180,22 +181,22 @@ echobase.info.workingDbconfiguration.deleted=Configuration à la base de travail '%s' supprimée echobase.info.workingDbconfiguration.disconnected=Déconnexion de la base de travail '%s' echobase.information.mission.created=La mission %s a été créée -echobase.information.one.file.required=Veuillez renseigner l'un des fichiers à importer +echobase.information.one.file.required=Veuillez fournir au moins un fichiers à importer echobase.label.admin.user.create=Création d'un utilisateur echobase.label.admin.user.delete=Suppression d'un utilisateur echobase.label.admin.user.edit=Mise à jour d'un utilisateur -echobase.label.createIfNotFound=Créer les entités non trouvées en base +echobase.label.createIfNotFound=Créer les entités non trouvées dans la base echobase.label.driverType=Type de base echobase.label.embeddedApplicationFileName=Nom de l'archive à télécharger -echobase.label.embeddedWarFileName=Nom du war à utiliser +echobase.label.embeddedWarFileName=Nom du fichier compressé .war à utiliser echobase.label.exportAsSeen=Exporter "comme à l'écran" echobase.label.exportDbFileName=Nom du fichier d'export echobase.label.exportFileName=Nom du fichier d'export echobase.label.importFile=Fichier à importer echobase.label.login=Connexion echobase.label.noWorkingDbSelected=Aucune base de travail sélectionnée -echobase.label.numberOfCreatedEntities=Nombre d'entitiés créées -echobase.label.numberOfUpdatedEntities=Nombre d'entitiés mises à jour +echobase.label.numberOfCreatedEntities=Nombre de champs créés +echobase.label.numberOfUpdatedEntities=Nombre de champs mis à jour echobase.label.query.description=Description echobase.label.query.name=Nom echobase.label.query.sql=SQL @@ -208,61 +209,62 @@ echobase.label.workingDbConfiguration.url=Url de connexion echobase.label.workingDbConfigurations=Bases de travail enregistrées echobase.label.workingDbSelected=Base de travail sélectionnée <strong>%s</strong> -echobase.legend.connectionToDb.detail=Détail de la connection à la base de données +echobase.legend.connectionToDb.detail=Informations détaillées de connexion à la base de données echobase.legend.dbeditor.edit=Edition de '%s' echobase.legend.dbeditor.show=Visualisation de '%s' echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée echobase.legend.exportDb.configuration.files=Configuration de l'export echobase.legend.importData.configuration.selectImportType=Sélection du type d'import echobase.legend.importData.configure=Configurer l'import -echobase.legend.importData.result.resume=Résultat -echobase.legend.importDb.configuration.files=Choix du fichier d'import de la base complête (fichier zip) -echobase.legend.libreOfficeQuery=Requète "libre office" -echobase.legend.sqlQuery.configuration=Configuration de la requète -echobase.legend.sqlQuery.result=Résultats de la requète +echobase.legend.importData.createMission=Caractéristiques de la mission +echobase.legend.importData.result.resume=Résultats +echobase.legend.importDb.configuration.files=Choix du fichier à importer (fichier .zip) +echobase.legend.libreOfficeQuery=Traduire une requête SQL issue de Libre Office +echobase.legend.sqlQuery.configuration=Définition de la requête +echobase.legend.sqlQuery.result=Résultats de la requête echobase.legend.workingDbConfiguration.create=Création d'une configuration de base de travail echobase.legend.workingDbConfiguration.use=Configuration de base de travail -echobase.menu.connectToDbInformations=Informations de connection à la base de travail +echobase.menu.connectToDbInformations=Informations de connexion à la base de données echobase.menu.createEmbeddedApplication=Créer une application embarquée echobase.menu.editData=Modifier les données echobase.menu.export=Exporter des données -echobase.menu.exportDb=Exporter une base complête +echobase.menu.exportDb=Exporter une base complète echobase.menu.importData=Importer des données -echobase.menu.importDb=Importer une base complête +echobase.menu.importDb=Importer une base complète echobase.menu.logs=Journal des modifications echobase.menu.users=Gérer les utilisateurs echobase.menu.viewData=Visualiser les données echobase.message.no.row.selected=Aucune donnée sélectionnée -echobase.message.noEntrySelection=Aucune entrée sélectionnée -echobase.message.warnEmbeddedApplicationInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de la création de l'application embarquée. -echobase.message.warnExportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'export. -echobase.message.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import. -echobase.title.confirm.deleteQuery=Supprimer une requète -echobase.title.confirm.deleteWorkingDbConfiguration=Supprimer la connexion -echobase.title.connectToDbInformations=Informations de connection à la base de données +echobase.message.noEntrySelection=Pas de champ sélectionné +echobase.message.warnEmbeddedApplicationInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de la création de l'application embarquée +echobase.message.warnExportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'export +echobase.message.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import +echobase.title.confirm.deleteQuery=Supprimer une requête +echobase.title.confirm.deleteWorkingDbConfiguration=Supprimer la configuration +echobase.title.connectToDbInformations=Informations de connexion à la base de données echobase.title.createEmbeddedApplication=Création de l'application embarquée echobase.title.createMission=Créer une mission -echobase.title.dbEditor=Modification de la base +echobase.title.dbEditor=Modification des données echobase.title.dbEditor.read=Visualisation des données echobase.title.embeddedApplicationProgress=Création de l'application embarquée en cours echobase.title.embeddedApplicationResult=Résultat de la création de l'application embarquée echobase.title.entityModificationLogs=Journal des modifications -echobase.title.export=Export Sql +echobase.title.export=Export SQL echobase.title.exportDb=Export complet de la base -echobase.title.exportDbProgress=Export complêt de la base de données en cours -echobase.title.exportDbResult=Résultat de l'export complêt de la base de données +echobase.title.exportDbProgress=Export complet de la base de données en cours +echobase.title.exportDbResult=Résultats de l'export complet de la base de données echobase.title.exportTable=Exporter une table echobase.title.importData.selectImportType=Sélection du type d'import -echobase.title.importDb=Import de données historiques +echobase.title.importDb=Import d'une base complète echobase.title.importDbProgress=Import de données en cours echobase.title.importDbResult=Résultats de l'import de données echobase.title.importTable=Importer une table echobase.title.login=Connexion -echobase.title.modification.detail=Détail de la modification -echobase.title.newLibreOfficeQuery=Importer une requète Libre-office -echobase.title.users=Adminitration des utilisateurs +echobase.title.modification.detail=Détails de la modification +echobase.title.newLibreOfficeQuery=Traduire une requête SQL issue de Libre Office +echobase.title.users=Administration des utilisateurs echobase.title.welcome=Bienvenue dans EchoBase -echobase.title.workingDbConfiguration=Administration des bases de travail +echobase.title.workingDbConfiguration=Administration des configuration de bases de travail echobase.tooltip.disconnectWorkingDb=Changer de base de travail echobase.tooltip.logout=Se déconnecter echobase.tooltip.selectWorkingDb=Sélectionner une base de travail Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -249,8 +249,7 @@ <s:param name="entityType" value="%{entityType}"/> </s:url> - <s:set var="tableI18nName" - value="%{getText('echobase.common.tableDatas', entityTypes[entityType])}"/> + <s:set var="tableI18nName" value="%{entityTypes[entityType]}"/> <sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -44,6 +44,10 @@ <s:label value="%{model.warLocation.name}" readonly="true" disabled="true" label="%{getText('echobase.label.embeddedWarFileName')}"/> + <br/> + <div class="cleanBoth"> + (*) <s:text name="echobase.info.exportDb.archive"/> + </div> </fieldset> <br/> @@ -55,7 +59,4 @@ align="right"/> </s:if> - - <div>(*) Il s'agit du nom de l'archive et du répertoire contenu dans l'archive, - l'extension <strong>.zip</strong> sera automatiquement rajoutée.</div> </s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -36,11 +36,11 @@ <s:textfield key="model.fileName" required="true" size="100" label="%{getText('echobase.label.exportDbFileName')} (*)"/> + <div class="cleanBoth"> + (*) <s:text name="echobase.info.exportDb.archive"/> + </div> </fieldset> <br/> <s:submit action="configure" value='%{getText("echobase.action.export")}'/> - <div>(*) Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> - sera automatiquement rajoutée.</div> - </s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -53,7 +53,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Acoustic" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#acoustic" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -46,7 +46,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#TotalSample__Su…" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#totalsample-sub…" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -45,8 +45,7 @@ </script> <s:radio id='mode' key='model.importMode' list="importModes" - cssClass="cleanBoth" - label='%{getText("echobase.common.importMode")}' + cssClass="cleanBoth" label='%{getText("echobase.common.importMode")}' required="true" template="myradiomap"/> <hr/> @@ -62,7 +61,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Voyage__Transit…" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#voyage-transit-…" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> @@ -131,7 +130,7 @@ <s:hidden key="model.importMode" value="TRANSECT" label=''/> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Voyage__Transit…" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#voyage-transit-…" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -40,7 +40,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Operation__Oper…" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#operation-opera…" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -70,7 +70,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Rsultats_voyage" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#r-sultats-voyage" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> @@ -111,7 +111,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Rsultats_Esdu" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#r-sultats-esdu" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> @@ -162,7 +162,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Region" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#region" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> @@ -203,7 +203,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#Map" + <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#map" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -30,8 +30,7 @@ <fieldset> <legend> - <s:text - name="echobase.legend.importData.createMission"/> + <s:text name="echobase.legend.importData.createMission"/> </legend> <s:textfield key="mission.name" size="40" required="true" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Update.jsp 2012-09-04 20:55:46 UTC (rev 613) @@ -42,7 +42,7 @@ <br/> <div class="cleanBoth"> - (*) Pour ne pas modifier le mot de passe laisser ce champs vide + (*) <s:text name="echobase.info.update.user.password"/> </div> </fieldset> <ul class="toolbar floatRight"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 13:19:53 UTC (rev 612) +++ trunk/pom.xml 2012-09-04 20:55:46 UTC (rev 613) @@ -160,6 +160,7 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> <echobaseI18nBundle>echobase-i18n</echobaseI18nBundle> + <i18n.failsIfWarning>true</i18n.failsIfWarning>  <locales>fr,en</locales>

1 0

r612 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 15:19:53 +0200 (Tue, 04 Sep 2012) New Revision: 612 Url: http://forge.codelutin.com/repositories/revision/echobase/612 Log: use a profile to not generate site 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 2012-09-04 12:54:56 UTC (rev 611) +++ trunk/echobase-domain/pom.xml 2012-09-04 13:19:53 UTC (rev 612) @@ -19,11 +19,6 @@ <name>EchoBase :: Domain</name> <description>EchoBase domain module</description> - <properties> -  - <maven.site.skip>true</maven.site.skip> - <maven.site.deploy.skip>true</maven.site.deploy.skip> - </properties> <build> <plugins> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-09-04 12:54:56 UTC (rev 611) +++ trunk/echobase-services/pom.xml 2012-09-04 13:19:53 UTC (rev 612) @@ -14,12 +14,6 @@ <name>EchoBase :: Services</name> <description>EchoBase services module</description> - <properties> -  - <maven.site.skip>true</maven.site.skip> - <maven.site.deploy.skip>true</maven.site.deploy.skip> - </properties> - <build> <resources> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-09-04 12:54:56 UTC (rev 611) +++ trunk/echobase-tools/pom.xml 2012-09-04 13:19:53 UTC (rev 612) @@ -26,9 +26,6 @@ ${basedir}/target/echobase-referentiel-${project.version}.zip </redmine.releaseFiles> -  - <maven.site.skip>true</maven.site.skip> - <maven.site.deploy.skip>true</maven.site.deploy.skip> </properties> <build> <pluginManagement> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-04 12:54:56 UTC (rev 611) +++ trunk/echobase-ui/pom.xml 2012-09-04 13:19:53 UTC (rev 612) @@ -21,10 +21,6 @@ <properties> -  - <maven.site.skip>true</maven.site.skip> - <maven.site.deploy.skip>true</maven.site.deploy.skip> -  <i18n.bundleOutputName>${echobaseI18nBundle}</i18n.bundleOutputName> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 12:54:56 UTC (rev 611) +++ trunk/pom.xml 2012-09-04 13:19:53 UTC (rev 612) @@ -520,6 +520,24 @@ </profile> +  + <profile> + <id>not-site</id> + <activation> + <file> + <missing>src/site</missing> + </file> + </activation> + + + <properties> +  + <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> + + </profile> + </profiles> </project>

1 0

r611 - in trunk: . src/site
by tchemit＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 14:54:56 +0200 (Tue, 04 Sep 2012) New Revision: 611 Url: http://forge.codelutin.com/repositories/revision/echobase/611 Log: refs #1404: updates libs fix site Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 06:50:16 UTC (rev 610) +++ trunk/pom.xml 2012-09-04 12:54:56 UTC (rev 611) @@ -135,8 +135,8 @@ <eugenePluginVersion>2.5</eugenePluginVersion> <topiaVersion>2.6.13</topiaVersion> - <nuitonUtilsVersion>2.7-SNAPSHOT</nuitonUtilsVersion> - <nuitonI18nVersion>2.5-SNAPSHOT</nuitonI18nVersion> + <nuitonUtilsVersion>2.6.1</nuitonUtilsVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.4</struts2Version> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-04 06:50:16 UTC (rev 610) +++ trunk/src/site/site_fr.xml 2012-09-04 12:54:56 UTC (rev 611) @@ -93,7 +93,7 @@ <item name="${project.name}" href="./index.html"/> </breadcrumbs> - <menu name="Language"> + <menu name="Langue"> <item name="Version Française" href="./index.html"/> <item name="English Version" href="./en/index.html"/> </menu>

1 0

r610 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication echobase-services/src/main/resources/embedded echobase-services/src/test/resources echobase-ui echobase-ui/src/main/java/fr/ifremer/echobase/ui
by tchemit＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 08:50:16 +0200 (Tue, 04 Sep 2012) New Revision: 610 Url: http://forge.codelutin.com/repositories/revision/echobase/610 Log: improve embeddedzip application + fix internal schema to create Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java trunk/echobase-services/src/main/resources/embedded/startEchobase.bat trunk/echobase-services/src/main/resources/embedded/startEchobase.sh trunk/echobase-services/src/test/resources/log4j.properties trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 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 2012-09-04 06:14:33 UTC (rev 609) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2012-09-04 06:50:16 UTC (rev 610) @@ -66,6 +66,58 @@ // should not be instanciated } + /** + * Open a new topia root context from the given jdbc configuration. + * + * @param jdbcConfiguration jdbc configuration + * @return the new fresh root context + */ + public static TopiaContext newWorkingDb(JdbcConfiguration jdbcConfiguration) { + + Properties properties = loadWorkingDbConfiguration(jdbcConfiguration); + TopiaContext result = newDb(properties); + + try { + if (!EchoBaseEntityHelper.isWorkingDbSchemaCreated(result)) { + + if (log.isInfoEnabled()) { + log.info("Will create schema for " + + jdbcConfiguration.getUrl()); + } + result.createSchema(); + } + } catch (TopiaException e) { + throw new EchoBaseTechnicalException("Could not create db schema", e); + } + return result; + } + + /** + * Open a new topia root context for the internal db of t3 (this should be + * a h2 db used only for security). + * + * @param internalDbDirectory directory of the internal db + * @return the new fresh root context of the internal db + */ + public static TopiaContext newInternalDb(File internalDbDirectory) { + + Properties properties = loadInternalDbconfiguration(internalDbDirectory); + TopiaContext result = newDb(properties); + try { + if (!EchoBaseEntityHelper.isInternalSchemaCreated(result)) { + + if (log.isInfoEnabled()) { + log.info("Will create schema for " + + properties.get(TopiaContextFactory.CONFIG_URL)); + } + result.createSchema(); + } + } catch (TopiaException e) { + throw new EchoBaseTechnicalException("Could not create db schema", e); + } + return result; + } + public static Properties loadWorkingDbConfiguration(JdbcConfiguration conf) { Properties result = new RecursiveProperties(); @@ -91,7 +143,7 @@ return result; } - public static Properties loadInternalDbconfiguration(File internalDbDirectory) { + protected static Properties loadInternalDbconfiguration(File internalDbDirectory) { Properties result = new RecursiveProperties(); String key = EchoBaseConfigurationOption.INTERNAL_DB_DIRECTORY.getKey(); @@ -104,45 +156,6 @@ return result; } - /** - * Open a new topia root context from the given jdbc configuration. - * - * @param jdbcConfiguration jdbc configuration - * @return the new fresh root context - */ - public static TopiaContext newWorkingDb(JdbcConfiguration jdbcConfiguration) { - - Properties properties = loadWorkingDbConfiguration(jdbcConfiguration); - TopiaContext result = newDb(properties); - - try { - if (!EchoBaseEntityHelper.isWorkingDbSchemaCreated(result)) { - - if (log.isInfoEnabled()) { - log.info("Will create schema for " + - jdbcConfiguration.getUrl()); - } - result.createSchema(); - } - } catch (TopiaException e) { - throw new EchoBaseTechnicalException("Could not create db schema", e); - } - return result; - } - - /** - * Open a new topia root context for the internal db of t3 (this should be - * a h2 db used only for security). - * - * @param internalDbDirectory directory of the internal db - * @return the new fresh root context of the internal db - */ - public static TopiaContext newInternalDb(File internalDbDirectory) { - - Properties result = loadInternalDbconfiguration(internalDbDirectory); - return newDb(result); - } - protected static void loadProperties(Properties result, String path, String entities) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-04 06:14:33 UTC (rev 609) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-04 06:50:16 UTC (rev 610) @@ -292,14 +292,11 @@ FileUtil.createDirectoryIfNecessary(dir); // copy embedded files to / - copyEmbeddedTextFile("echobase.properties", dir); - copyEmbeddedTextFile("startEchobase.bat", dir); - copyEmbeddedTextFile("startEchobase.sh", dir); - copyEmbeddedTextFile("README.txt", dir); + copyEmbeddedTextFile("echobase.properties", dir, false); + copyEmbeddedTextFile("startEchobase.bat", dir, true); + copyEmbeddedTextFile("startEchobase.sh", dir, true); + copyEmbeddedTextFile("README.txt", dir, false); -// Properties config = new Properties(); -// copyEmbeddedTextFile("echobase.properties", dir, config); - // copy war to / File warLocation = model.getWarLocation(); FileUtils.copyFile(warLocation, @@ -354,50 +351,9 @@ } } -// protected void copyEmbeddedFiles(File zipDirectory) throws IOException, URISyntaxException { -// -// // config to keep the echobase-embedded values (contains h2 and pg versions) -// Properties config = new Properties(); -// copyEmbeddedTextFile("echobase.properties", zipDirectory, config); -// -// copyEmbeddedTextFile("startEchobase.bat", zipDirectory, null); -// copyEmbeddedTextFile("startEchobase.sh", zipDirectory, null); -// copyEmbeddedTextFile("README.txt", zipDirectory, null); -// } - -// public void copyEmbeddedTextFile(String resourceName, -// File targetDirectory, -// Properties config) throws IOException { -// String resourcePath = EMBEDDED_PATH + resourceName; -// InputStream inputStream = getClass().getResourceAsStream(resourcePath); -// Preconditions.checkNotNull(inputStream, -// "could not find resource " + resourcePath); -// try { -// if (config != null) { -// config.load(inputStream); -// } -// File outputFile = new File(targetDirectory, resourceName); -// if (log.isInfoEnabled()) { -// log.info("Copy configuration to " + resourceName + " to " + outputFile); -// } -// OutputStreamWriter outputStream = new OutputStreamWriter( -// new FileOutputStream(outputFile), Charsets.UTF_8); -// try { -// if (config == null) { -// IOUtils.copy(inputStream, outputStream); -// } else { -// config.store(outputStream, null); -// } -// } finally { -// outputStream.close(); -// } -// } finally { -// inputStream.close(); -// } -// } - public void copyEmbeddedTextFile(String resourceName, - File targetDirectory) throws IOException { + File targetDirectory, + boolean executable) throws IOException { String resourcePath = EMBEDDED_PATH + resourceName; InputStream inputStream = getClass().getResourceAsStream(resourcePath); Preconditions.checkNotNull(inputStream, @@ -414,6 +370,9 @@ } finally { outputStream.close(); } + if (executable) { + outputFile.setExecutable(true); + } } finally { inputStream.close(); } Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-09-04 06:14:33 UTC (rev 609) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-09-04 06:50:16 UTC (rev 610) @@ -39,7 +39,7 @@ set ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" echo java options used : %ECHOBASE_OPTS% -%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}.war +%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 goto end :end Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-09-04 06:14:33 UTC (rev 609) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-09-04 06:50:16 UTC (rev 610) @@ -11,6 +11,6 @@ cd `dirname $0` CURRENTPWD=`pwd` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" -$JAVA_EXEC $ECHOBASE_OPTS -jar echobase-ui-${project.version}.war $* +$JAVA_EXEC $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* cd "$OLDPWD" Modified: trunk/echobase-services/src/test/resources/log4j.properties =================================================================== --- trunk/echobase-services/src/test/resources/log4j.properties 2012-09-04 06:14:33 UTC (rev 609) +++ trunk/echobase-services/src/test/resources/log4j.properties 2012-09-04 06:50:16 UTC (rev 610) @@ -30,5 +30,4 @@ # package level log4j.logger.fr.ifremer.echobase=INFO -#log4j.logger.fr.ifremer.echobase.services.ReplicateEntityVisitor=DEBUG -#log4j.logger.fr.ifremer.echobase.services.importdata.AcousticImportServiceUG +log4j.logger.org.nuiton.topia.migration=INFO Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-04 06:14:33 UTC (rev 609) +++ trunk/echobase-ui/pom.xml 2012-09-04 06:50:16 UTC (rev 610) @@ -326,13 +326,13 @@ <id>assembly</id> <activation> <property> - <name>performRelease</name> - <value>true</value> + <name>skipAssembly</name> + <value>!true</value> </property> </activation> <properties> <embeddedWarDir> - ${project.build.directory}/echobase-embedded-${project.version} + ${project.build.directory}/echobase-${project.version}-embedded </embeddedWarDir> </properties> <build> @@ -469,8 +469,8 @@ </configuration> <executions> <execution> - <id>create-assemblies</id> - <phase>verify</phase> + <id>create-embedded-zip</id> + <phase>package</phase> <goals> <goal>single</goal> </goals> 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 2012-09-04 06:14:33 UTC (rev 609) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-09-04 06:50:16 UTC (rev 610) @@ -194,22 +194,11 @@ TopiaContext rootContext = context.getInternalRootContext(); Preconditions.checkNotNull(rootContext); - boolean schemaExist = - EchoBaseEntityHelper.isInternalSchemaCreated(rootContext); - - if (schemaExist) { - - if (configuration.isUpdateSchema()) { - if (log.isInfoEnabled()) { - log.info("Will update schema..."); - } - rootContext.updateSchema(); - } - } else { + if (configuration.isUpdateSchema()) { if (log.isInfoEnabled()) { - log.info("Will create schema..."); + log.info("Will update schema..."); } - rootContext.createSchema(); + rootContext.updateSchema(); } TopiaContext tx = rootContext.beginTransaction();

1 0

r609 - in trunk: . echobase-domain echobase-domain/src/main/java/fr/ifremer/echobase echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb echobase-domain/src/main/java/fr/ifremer/echobase/services echobase-domain/src/main/resources echobase-domain
by tchemit＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 08:14:33 +0200 (Tue, 04 Sep 2012) New Revision: 609 Url: http://forge.codelutin.com/repositories/revision/echobase/609 Log: - introduce topia migration service for both db - prepare a embedded zip and war with no more usage of a jdk but just a jre Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion trunk/echobase-ui/src/main/assembly/ trunk/echobase-ui/src/main/assembly/bin.xml trunk/echobase-ui/src/main/assembly/dist/ trunk/echobase-ui/src/main/assembly/dist/README.txt trunk/echobase-ui/src/main/assembly/dist/echobase.properties trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh Modified: trunk/echobase-domain/pom.xml 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/EchoBaseFunctions.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.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/persistence/JdbcConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/ServiceFactoryAware.java trunk/echobase-domain/src/main/resources/echobase-internaldb.properties trunk/echobase-domain/src/main/resources/echobase-workingdb.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java trunk/echobase-services/src/main/resources/embedded/echobase.properties trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.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/DownloadDriver.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/information.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/pom.xml 2012-09-04 06:14:33 UTC (rev 609) @@ -146,11 +146,6 @@ <artifactId>nuiton-csv</artifactId> </dependency> -  -  <dependency> @@ -191,6 +186,11 @@ </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-09-04 06:14:33 UTC (rev 609) @@ -27,7 +27,6 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContextFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; @@ -111,7 +110,7 @@ createDirectory(EchoBaseConfigurationOption.DATA_DIRECTORY); try { - FileUtils.forceMkdir(getWarDirectory()); +// FileUtils.forceMkdir(getWarDirectory()); FileUtils.forceMkdir(getLibDirectory()); } catch (IOException e) { throw new EchoBaseTechnicalException(e); @@ -153,12 +152,12 @@ return file; } - public File getWarDirectory() { - File file = applicationConfig.getOptionAsFile( - EchoBaseConfigurationOption.WAR_DIRECTORY.key); - Preconditions.checkNotNull(file); - return file; - } +// public File getWarDirectory() { +// File file = applicationConfig.getOptionAsFile( +// EchoBaseConfigurationOption.WAR_DIRECTORY.key); +// Preconditions.checkNotNull(file); +// return file; +// } public File getWarLocation() { File file = applicationConfig.getOptionAsFile( @@ -195,16 +194,10 @@ return v; } - public Class<?> getDriverClass() { - Class<?> klass = applicationConfig.getOptionAsClass( - TopiaContextFactory.CONFIG_DRIVER); - Preconditions.checkNotNull(klass); - return klass; - } - public boolean isEmbedded() { - Class<?> driverClass = getDriverClass(); - return driverClass.getName().toLowerCase().contains("h2"); + Boolean result = applicationConfig.getOptionAsBoolean( + EchoBaseConfigurationOption.EMBEDDED.key); + return result != null && result; } public boolean getOptionAsBoolean(String propertyName) { Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2012-09-04 06:14:33 UTC (rev 609) @@ -61,12 +61,9 @@ CSV_SEPARATOR("echobase.csv.separator", n_("echobase.config.csv.separator.description"), ";", char.class), - WAR_DIRECTORY("echobase.war.directory", - n_("echobase.config.war.directory.description"), - "${echobase.data.directory}/war", File.class), WAR_LOCATION("echobase.war.location", n_("echobase.config.war.location.description"), - "${echobase.war.directory}/echobase-ui-${echobase.version}.war", + "${echobase.data.directory}/war/echobase-ui-${echobase.version}-embedded.war", File.class); /** Configuration key. */ Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-09-04 06:14:33 UTC (rev 609) @@ -54,7 +54,6 @@ import fr.ifremer.echobase.entities.references.Strata; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.entities.references.VesselType; -import org.nuiton.topia.persistence.TopiaEntity; import java.io.File; import java.util.Map; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseDbMeta.java 2012-09-04 06:14:33 UTC (rev 609) @@ -32,8 +32,6 @@ import java.util.Arrays; import java.util.List; -import static org.nuiton.i18n.I18n.n_; - /** * TODO * @@ -222,64 +220,4 @@ public EchoBasePersistenceHelper getPersistenceHelper() { return (EchoBasePersistenceHelper) super.getPersistenceHelper(); } - - /** - * - * I18n definition (we need it for generic dbeditor, but we don't want - * ToPIA to generate all keys for all property) - * @since 1.1 - */ - static { - n_("echobase.common.admin"); - n_("echobase.common.areaOfOperation"); - n_("echobase.common.author"); - n_("echobase.common.authorEmail"); - n_("echobase.common.calibration"); - n_("echobase.common.cell"); - n_("echobase.common.data"); - n_("echobase.common.dataAcquisition"); - n_("echobase.common.dataCentre"); - n_("echobase.common.dataCentreEmail"); - n_("echobase.common.dataProcessing"); - n_("echobase.common.dataQuality"); - n_("echobase.common.datum"); - n_("echobase.common.depthStratum"); - n_("echobase.common.description"); - n_("echobase.common.distributionStatement"); - n_("echobase.common.echoBaseUser"); - n_("echobase.common.email"); - n_("echobase.common.entityId"); - n_("echobase.common.entityModificationLog"); - n_("echobase.common.entityType"); - n_("echobase.common.exportQuery"); - n_("echobase.common.id"); - n_("echobase.common.institution"); - n_("echobase.common.keywords"); - n_("echobase.common.lastModifiedDate"); - n_("echobase.common.lastModifiedUser"); - n_("echobase.common.litteratureReferences"); - n_("echobase.common.metadata"); - n_("echobase.common.mission"); - n_("echobase.common.missionAbstract"); - n_("echobase.common.modificationDate"); - n_("echobase.common.modificationText"); - n_("echobase.common.modificationUser"); - n_("echobase.common.name"); - n_("echobase.common.organisationLevelAcknowledgements"); - n_("echobase.common.organisationReferences"); - n_("echobase.common.password"); - n_("echobase.common.platform"); - n_("echobase.common.principalInvestigator"); - n_("echobase.common.principalInvestigatorEmail"); - n_("echobase.common.project"); - n_("echobase.common.referenceDatum"); - n_("echobase.common.source"); - n_("echobase.common.species"); - n_("echobase.common.sqlQuery"); - n_("echobase.common.transect"); - n_("echobase.common.transit"); - n_("echobase.common.vessel"); - n_("echobase.common.voyage"); - n_("echobase.config.data.directory.description"); - } } 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2012-09-04 06:14:33 UTC (rev 609) @@ -23,6 +23,8 @@ * #L% */ +import fr.ifremer.echobase.entities.EchoBaseUserImpl; +import fr.ifremer.echobase.entities.data.VoyageImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Transaction; @@ -135,4 +137,36 @@ } } } + + /** + * Tests if the internal database schema created. + * + * @param tx transaction + * @return {@code true} if the schema is already created, {@code false} + * otherwise + * @throws TopiaException if something was wrong while requesting database + */ + public static boolean isInternalSchemaCreated(TopiaContext tx) throws TopiaException { + + boolean schemaFound = + ((TopiaContextImplementor) tx).isSchemaExist(EchoBaseUserImpl.class); + + return schemaFound; + } + + /** + * Tests if the working database schema created. + * + * @param tx transaction + * @return {@code true} if the schema is already created, {@code false} + * otherwise + * @throws TopiaException if something was wrong while requesting database + */ + public static boolean isWorkingDbSchemaCreated(TopiaContext tx) throws TopiaException { + + boolean schemaFound = + ((TopiaContextImplementor) tx).isSchemaExist(VoyageImpl.class); + + return schemaFound; + } } 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2012-09-04 06:14:33 UTC (rev 609) @@ -25,19 +25,18 @@ import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EchoBaseUserImpl; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaPersistenceHelper; /** - * TODO + * Persistence helper for working db. * * @author tchemit <chemit(a)codelutin.com> + * @see TopiaPersistenceHelper * @since 1.1 */ public class EchoBasePersistenceHelper implements TopiaPersistenceHelper<EchoBaseEntityEnum> { @@ -61,19 +60,4 @@ return (TopiaDAO<E>) getDAO(tx, type.getContract()); } - /** - * Tests if the internal database schema created. - * - * @param tx transaction - * @return {@code true} if the schema is already created, {@code false} - * otherwise - * @throws TopiaException if something was wrong while requesting database - */ - public boolean isInternalSchemaCreated(TopiaContext tx) throws TopiaException { - - boolean schemaFound = - ((TopiaContextImplementor) tx).isSchemaExist(EchoBaseUserImpl.class); - - return schemaFound; - } } 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2012-09-04 06:14:33 UTC (rev 609) @@ -25,6 +25,7 @@ import com.google.common.base.Charsets; import fr.ifremer.echobase.EchoBaseConfigurationOption; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseInternalDAOHelper; @@ -32,9 +33,9 @@ import org.apache.commons.logging.LogFactory; 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.topia.framework.TopiaContextImplementor; import org.nuiton.util.RecursiveProperties; import java.io.File; @@ -111,8 +112,22 @@ */ public static TopiaContext newWorkingDb(JdbcConfiguration jdbcConfiguration) { - Properties result = loadWorkingDbConfiguration(jdbcConfiguration); - return newDb(result); + Properties properties = loadWorkingDbConfiguration(jdbcConfiguration); + TopiaContext result = newDb(properties); + + try { + if (!EchoBaseEntityHelper.isWorkingDbSchemaCreated(result)) { + + if (log.isInfoEnabled()) { + log.info("Will create schema for " + + jdbcConfiguration.getUrl()); + } + result.createSchema(); + } + } catch (TopiaException e) { + throw new EchoBaseTechnicalException("Could not create db schema", e); + } + return result; } /** @@ -166,20 +181,18 @@ configuration.get(TopiaContextFactory.CONFIG_URL)); } TopiaContext result = TopiaContextFactory.getContext(configuration); + return result; } catch (TopiaNotFoundException e) { throw new TopiaRuntimeException("Could not init db", e); } } - public static void reloadProperty(Properties properties, String propertyName, String propertyNameToRemove) { + public static void reloadProperty(Properties properties, + String propertyName, + String propertyNameToRemove) { Object o = properties.getProperty(propertyName); properties.put(propertyName, o); properties.remove(propertyNameToRemove); } - - public static String getDbUrl(TopiaContext rootContext) { - String result = (String) ((TopiaContextImplementor) rootContext).getConfig().get(TopiaContextFactory.CONFIG_URL); - return result; - } } Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java 2012-09-04 06:14:33 UTC (rev 609) @@ -29,15 +29,15 @@ public class JdbcConfiguration implements Serializable { - public static JdbcConfiguration newConfig(String url, + public static JdbcConfiguration newConfig(DriverType driverType, + String url, String login, - String password, - DriverType driverType) { + String password) { JdbcConfiguration result = new JdbcConfiguration(); + result.setDriverType(driverType); result.setUrl(url); result.setLogin(login); result.setPassword(password); - result.setDriverType(driverType); return result; } @@ -48,7 +48,7 @@ String databaseAbsolutePath = databaseFile.getAbsolutePath(); String url = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;LOG=0;CACHE_SIZE=65536;LOCK_MODE=0;UNDO_LOG=0"; - JdbcConfiguration result = newConfig(url, "sa", "sa", DriverType.H2); + JdbcConfiguration result = newConfig(DriverType.H2, url, "sa", "sa"); return result; } Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,79 @@ +package fr.ifremer.echobase.persistence.migration; + +/* + * #%L + * EchoBase :: Domain + * $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% + */ + +import com.google.common.collect.Maps; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; + +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; + +/** + * Migration callBack resolver using service loader to discover version to + * apply and using also a generic migration call back. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class EchoBaseMigrationCallBackResolver<C extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion> implements TopiaMigrationCallbackByClassNG.MigrationCallBackForVersionResolver { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(EchoBaseMigrationCallBackResolver.class); + + public static <C extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion> EchoBaseMigrationCallBackResolver<C> newResolver(Class<C> resolverType) { + return new EchoBaseMigrationCallBackResolver<C>(resolverType); + } + + protected final Map<Version, C> versionMigrationMapping; + + protected EchoBaseMigrationCallBackResolver(Class<C> migrationType) { + this.versionMigrationMapping = Maps.newTreeMap( + new VersionUtil.VersionComparator()); + for (C callBackForVersion : ServiceLoader.load(migrationType)) { + Version version = callBackForVersion.getVersion(); + if (log.isInfoEnabled()) { + log.info("Detects migration version " + version + " [" + + callBackForVersion + "]"); + } + versionMigrationMapping.put(version, callBackForVersion); + } + } + + @Override + public C getCallBack(Version version) { + return versionMigrationMapping.get(version); + } + + @Override + public Set<Version> getAllVersions() { + return versionMigrationMapping.keySet(); + } + +} \ No newline at end of file Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,44 @@ +package fr.ifremer.echobase.persistence.migration.internalDb; + +/* + * #%L + * EchoBase :: Domain + * $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% + */ + +import org.hibernate.dialect.Dialect; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; + +/** + * Base migration support for a internal db. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { + + protected Dialect getDialect(TopiaContextImplementor tx) throws TopiaNotFoundException { + Dialect dialect = + Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); + return dialect; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,56 @@ +package fr.ifremer.echobase.persistence.migration.internalDb; + +/* + * #%L + * EchoBase :: Domain + * $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% + */ + +import fr.ifremer.echobase.entities.EchoBaseInternalDAOHelper; +import fr.ifremer.echobase.persistence.migration.EchoBaseMigrationCallBackResolver; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; + +import java.util.List; + +/** + * EchoBase Migration callback for internal db. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class MigrationCallback extends TopiaMigrationCallbackByClassNG { + + public MigrationCallback() { + super(EchoBaseMigrationCallBackResolver.newResolver( + fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion.class)); + } + + @Override + public Version getApplicationVersion() { + return VersionUtil.valueOf(EchoBaseInternalDAOHelper.getModelVersion()); + } + + @Override + public boolean askUser(Version version, List<Version> versions) { + return true; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,44 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +/* + * #%L + * EchoBase :: Domain + * $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% + */ + +import org.hibernate.dialect.Dialect; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; + +/** + * Base migration support for a working db. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { + + protected Dialect getDialect(TopiaContextImplementor tx) throws TopiaNotFoundException { + Dialect dialect = + Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); + return dialect; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,56 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +/* + * #%L + * EchoBase :: Domain + * $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% + */ + +import fr.ifremer.echobase.entities.EchoBaseDAOHelper; +import fr.ifremer.echobase.persistence.migration.EchoBaseMigrationCallBackResolver; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; + +import java.util.List; + +/** + * EchoBase Migration callback for working db. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class MigrationCallback extends TopiaMigrationCallbackByClassNG { + + public MigrationCallback() { + super(EchoBaseMigrationCallBackResolver.newResolver( + fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion.class)); + } + + @Override + public Version getApplicationVersion() { + return VersionUtil.valueOf(EchoBaseDAOHelper.getModelVersion()); + } + + @Override + public boolean askUser(Version version, List<Version> versions) { + return true; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallback.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,61 @@ +package fr.ifremer.echobase.persistence.migration.workingDb; + +/* + * #%L + * EchoBase :: Domain + * $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% + */ + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; + +import java.util.Arrays; +import java.util.List; + +/** + * Migration for version {@code 1.1}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class MigrationCallbackV1_1 extends MigrationCallBackForVersion { + + @Override + public Version getVersion() { + return VersionUtil.valueOf("1.1"); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + String[] sqls = new String[]{ + "DROP TABLE echobaseuser;", + "DROP TABLE exportquery;" + }; + + queries.addAll(Arrays.asList(sqls)); + + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallbackV1_1.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2012-09-04 06:14:33 UTC (rev 609) @@ -26,9 +26,9 @@ import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; -import fr.ifremer.echobase.persistence.EchoBaseDbMeta; import fr.ifremer.echobase.entities.EchoBaseInternalDAOHelper; import fr.ifremer.echobase.entities.EchobaseInternalEntity; +import fr.ifremer.echobase.persistence.EchoBaseDbMeta; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/ServiceFactoryAware.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/ServiceFactoryAware.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/ServiceFactoryAware.java 2012-09-04 06:14:33 UTC (rev 609) @@ -29,7 +29,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.1 */ -public interface ServiceFactoryAware { +public interface ServiceFactoryAware { <S extends EchoBaseService> S getService(Class<S> serviceClass); Property changes on: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion (rev 0) +++ trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1 @@ +fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallbackV1_1 \ No newline at end of file Property changes on: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/resources/echobase-internaldb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -20,9 +20,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -hibernate.hbm2ddl.auto=update -hibernate.show_sql=false +# Database basic configuration hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider hibernate.connection.username=sa @@ -30,3 +29,16 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${echobase.internal.db.directory}/echobase-user +# Never create/update schema (will do it by logic) +hibernate.hbm2ddl.auto=none + +# To custom sql in logger +hibernate.show_sql=false +hibernate.format_sql=false +hibernate.use_sql_comments=false + +# Database migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallback +topia.service.migration.showSql=true + Modified: trunk/echobase-domain/src/main/resources/echobase-workingdb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -20,11 +20,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -# DB configuration -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.use_sql_comments=false -hibernate.hbm2ddl.auto=none + +# Database basic configuration hibernate.connection.username=${configuration.login} hibernate.connection.password=${configuration.password} hibernate.connection.url=${configuration.url} @@ -32,8 +29,16 @@ hibernate.dialect=${configuration.dialect} hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider -# Migration configuration -#topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine -#topia.service.migration.callback=fr.ird.t3.services.migration.T3MigrationCallback -#topia.service.migration.showSql=true +# Never create/update schema (will do it by logic) +hibernate.hbm2ddl.auto=none +# To custom sql in logger +hibernate.show_sql=false +hibernate.format_sql=false +hibernate.use_sql_comments=false + +# Database migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallback +topia.service.migration.showSql=true + 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -1,55 +1,5 @@ -echobase.common.admin= -echobase.common.areaOfOperation= -echobase.common.author= -echobase.common.authorEmail= -echobase.common.calibration= -echobase.common.cell= -echobase.common.data= -echobase.common.dataAcquisition= -echobase.common.dataCentre= -echobase.common.dataCentreEmail= -echobase.common.dataProcessing= -echobase.common.dataQuality= -echobase.common.datum= -echobase.common.depthStratum= -echobase.common.description= -echobase.common.distributionStatement= echobase.common.driverType.h2= echobase.common.driverType.postgres= -echobase.common.echoBaseUser= -echobase.common.email= -echobase.common.entityId= -echobase.common.entityModificationLog= -echobase.common.entityType= -echobase.common.exportQuery= -echobase.common.id= -echobase.common.institution= -echobase.common.keywords= -echobase.common.lastModifiedDate= -echobase.common.lastModifiedUser= -echobase.common.litteratureReferences= -echobase.common.metadata= -echobase.common.mission= -echobase.common.missionAbstract= -echobase.common.modificationDate= -echobase.common.modificationText= -echobase.common.modificationUser= -echobase.common.name= -echobase.common.organisationLevelAcknowledgements= -echobase.common.organisationReferences= -echobase.common.password= -echobase.common.platform= -echobase.common.principalInvestigator= -echobase.common.principalInvestigatorEmail= -echobase.common.project= -echobase.common.referenceDatum= -echobase.common.source= -echobase.common.species= -echobase.common.sqlQuery= -echobase.common.transect= -echobase.common.transit= -echobase.common.vessel= -echobase.common.voyage= echobase.config.csv.separator.description= echobase.config.data.directory.description= echobase.config.embedded.description= @@ -57,6 +7,5 @@ echobase.config.internal.db.directory.description= echobase.config.postgresqlVersion.description= echobase.config.version.description= -echobase.config.war.directory.description= echobase.config.war.location.description= -echobase.configuration.description=Configuration d'EchoBase +echobase.configuration.description=EchoBase configuration Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -1,62 +1,11 @@ -echobase.common.admin=Administrateur -echobase.common.areaOfOperation=AreaOfOperation -echobase.common.author=Auteur -echobase.common.authorEmail=Courriel de l'auteur -echobase.common.calibration=Calibration -echobase.common.cell=Cell -echobase.common.data=Data -echobase.common.dataAcquisition=DataAcquisition -echobase.common.dataCentre=Centre de données -echobase.common.dataCentreEmail=Courriel du centre de données -echobase.common.dataProcessing=DataProcessing -echobase.common.dataQuality=DataQuality -echobase.common.datum=Datum -echobase.common.depthStratum=DepthStratum -echobase.common.description=Description -echobase.common.distributionStatement=distributionStatement echobase.common.driverType.h2=Base H2 echobase.common.driverType.postgres=Base Postgresql -echobase.common.echoBaseUser=Utilisateur -echobase.common.email=Courriel -echobase.common.entityId=Identifiant de l'entité -echobase.common.entityModificationLog=Journal des modifications -echobase.common.entityType=Type de l'entité -echobase.common.exportQuery=Requête d'export -echobase.common.id=Identifiant -echobase.common.institution=Institution -echobase.common.keywords=Môts clefs -echobase.common.lastModifiedDate=Date de dernière modification -echobase.common.lastModifiedUser=Utilisateur de dernière modification -echobase.common.litteratureReferences=Références -echobase.common.metadata=Metadata -echobase.common.mission=Mission -echobase.common.missionAbstract=Résumé de la mission -echobase.common.modificationDate=Date de modification -echobase.common.modificationText=Modification -echobase.common.modificationUser=Utilisateur -echobase.common.name=Nom -echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements -echobase.common.organisationReferences=Références organisation -echobase.common.password=Mot de passe -echobase.common.platform=Platform -echobase.common.principalInvestigator=Chercheur -echobase.common.principalInvestigatorEmail=Courriel du chercheur -echobase.common.project=Projet -echobase.common.referenceDatum=ReferenceDatum -echobase.common.source=Source -echobase.common.species=Espèce -echobase.common.sqlQuery=Requête SQL -echobase.common.transect=Transect -echobase.common.transit=Transit -echobase.common.vessel=Navire -echobase.common.voyage=Campagne -echobase.config.csv.separator.description= +echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application -echobase.config.embedded.description= +echobase.config.embedded.description=Pour créer au démarrage une configuration vers la base h2 embarquée (uniquement pour les applications embarquées) echobase.config.h2Version.description=Version du pilote jdbc H2 echobase.config.internal.db.directory.description=Répertoire de la base interne echobase.config.postgresqlVersion.description=Version du pilote jdbc Postgresql echobase.config.version.description=Version de l'application -echobase.config.war.directory.description=Répertoire où sont accessibles les wars -echobase.config.war.location.description=chemin d'accèss au war embarqué à utiliser pour créer des applications embarquées +echobase.config.war.location.description=Chemin d'accèss au war embarqué à utiliser pour créer des applications embarquées echobase.configuration.description=Configuration d'EchoBase Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-04 06:14:33 UTC (rev 609) @@ -26,7 +26,6 @@ import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import fr.ifremer.echobase.EchoBaseTechnicalException; -import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; import fr.ifremer.echobase.entities.WorkingDbConfiguration; @@ -45,7 +44,6 @@ import fr.ifremer.echobase.services.importdb.ImportDbConfiguration; import fr.ifremer.echobase.services.importdb.ImportDbService; import fr.ifremer.echobase.services.workingDb.WorkingDbConfigurationAlreadyExistException; -import fr.ifremer.echobase.services.workingDb.WorkingDbConfigurationService; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -189,8 +187,6 @@ model.incrementsProgression(); // get all working db configuration from application - WorkingDbConfigurationService workingDbConfigurationService = - newServiceContext.getService(WorkingDbConfigurationService.class); List<WorkingDbConfiguration> confs = getEntities(WorkingDbConfiguration.class); @@ -199,16 +195,6 @@ getInternalTransaction().replicateEntities( newServiceContext.getInternalTransaction(), confs); - // add a new configuration to the embedded working db - WorkingDbConfiguration conf = - workingDbConfigurationService.newConfiguration(); - conf.setDriverType(DriverType.H2); - conf.setLogin("sa"); - conf.setDescription("Embedded working db"); - conf.setUrl("jdbc:h2:file:${echobase.data.directory}/db/echobase;CACHE_SIZE=65536;AUTO_SERVER=TRUE"); - - workingDbConfigurationService.create(conf); - model.incrementsProgression(); return admin; @@ -226,10 +212,9 @@ EchoBaseUser admin) throws IOException, TopiaException { JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(dir); - TopiaContext rootContext = EchobaseTopiaContexts.newWorkingDb(dbConf); + TopiaContext rootContext = EchobaseTopiaContexts.newWorkingDb( + dbConf); try { - // create db schema - rootContext.createSchema(); // inject a new transaction in service context newServiceContext.setTransaction(rootContext.beginTransaction()); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java 2012-09-04 06:14:33 UTC (rev 609) @@ -24,6 +24,7 @@ */ import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.entities.WorkingDbConfiguration; import fr.ifremer.echobase.entities.WorkingDbConfigurationDAO; import fr.ifremer.echobase.services.EchoBaseServiceSupport; @@ -112,6 +113,23 @@ } } + public void createEmbeddedWorkingDbConfiguration() { + + String url = "jdbc:h2:file:${echobase.data.directory}/db/echobase;CACHE_SIZE=65536;AUTO_SERVER=TRUE"; + if (!isUrlAlreadyUsed(url)) { + WorkingDbConfiguration conf = newConfiguration(); + conf.setDriverType(DriverType.H2); + conf.setLogin("sa"); + conf.setDescription("Embedded working db"); + conf.setUrl(url); + try { + create(conf); + } catch (WorkingDbConfigurationAlreadyExistException e) { + // can not happen + } + } + } + protected WorkingDbConfiguration getExistingConf(String id) throws WorkingDbConfigurationNotFoundException { WorkingDbConfiguration entity = getEntityById(WorkingDbConfiguration.class, id); Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -25,5 +25,8 @@ # Where to find data echobase.data.directory=. -# where to find war -echobase.war.directory=${echobase.data.directory} +# Where to find war +echobase.war.location=${echobase.data.directory}/echobase-ui-${echobase.version}-embedded.war + +# To create embedded working db +echobase.embedded=true Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-09-04 06:14:33 UTC (rev 609) @@ -94,7 +94,8 @@ JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(testdir); - topiaContext = EchobaseTopiaContexts.newWorkingDb(dbConf); + topiaContext = EchobaseTopiaContexts.newWorkingDb( + dbConf); serviceContext = DefaultEchoBaseServiceContext.newContext( Locale.getDefault(), Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-09-04 06:14:33 UTC (rev 609) @@ -23,23 +23,16 @@ */ package fr.ifremer.echobase.tools; -import fr.ifremer.echobase.persistence.EchobaseTopiaContexts; -import fr.ifremer.echobase.persistence.JdbcConfiguration; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assume; import org.junit.Ignore; import org.junit.rules.TestName; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.FileUtil; import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; /** * Utility methods for tests @@ -98,32 +91,32 @@ FileUtil.createDirectoryIfNecessary(result); return result; } +// +// public static TopiaContext getRootContext(File dbDir) { +// +// JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(dbDir); +// TopiaContext context = EchobaseTopiaContexts.newWorkingDb(persistenceHelper, dbConf); +// return context; +// } - public static TopiaContext getRootContext(File dbDir) { +// /** +// * Used to get all contract of a package +// * +// * @param entitiesPackage package contening desired entities +// * @return contracts contained in entitiesPackage +// */ +// public static EchoBaseEntityEnum[] getContractsOf(Package entitiesPackage) { +// EchoBaseEntityEnum[] echoBaseEntityEnums = EchoBaseEntityEnum.values(); +// List<EchoBaseEntityEnum> refClasses = new ArrayList<EchoBaseEntityEnum>(); +// for (EchoBaseEntityEnum echoBaseEntityEnum : echoBaseEntityEnums) { +// +// // Get all entities in package fr.ifremer.echobase.entities.references +// Class<? extends TopiaEntity> contract = echoBaseEntityEnum.getContract(); +// if (entitiesPackage.equals(contract.getPackage())) { +// refClasses.add(echoBaseEntityEnum); +// } +// } +// return refClasses.toArray(new EchoBaseEntityEnum[refClasses.size()]); +// } - JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(dbDir); - TopiaContext context = EchobaseTopiaContexts.newWorkingDb(dbConf); - return context; - } - - /** - * Used to get all contract of a package - * - * @param entitiesPackage package contening desired entities - * @return contracts contained in entitiesPackage - */ - public static EchoBaseEntityEnum[] getContractsOf(Package entitiesPackage) { - EchoBaseEntityEnum[] echoBaseEntityEnums = EchoBaseEntityEnum.values(); - List<EchoBaseEntityEnum> refClasses = new ArrayList<EchoBaseEntityEnum>(); - for (EchoBaseEntityEnum echoBaseEntityEnum : echoBaseEntityEnums) { - - // Get all entities in package fr.ifremer.echobase.entities.references - Class<? extends TopiaEntity> contract = echoBaseEntityEnum.getContract(); - if (entitiesPackage.equals(contract.getPackage())) { - refClasses.add(echoBaseEntityEnum); - } - } - return refClasses.toArray(new EchoBaseEntityEnum[refClasses.size()]); - } - } Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/pom.xml 2012-09-04 06:14:33 UTC (rev 609) @@ -31,11 +31,14 @@ <env>dev</env> <redmine.releaseFiles> - ${basedir}/target/${project.build.finalName}.war + ${project.build.directory}/${project.build.finalName}.war, + ${project.build.directory}/${project.build.finalName}-embedded.war + ${project.build.directory}/${project.build.finalName}-embedded.zip </redmine.releaseFiles> <deployFiles> - ${basedir}/target/${project.build.finalName}.war + ${project.build.directory}/${project.build.finalName}.war, + ${project.build.directory}/${project.build.finalName}-embedded.war </deployFiles> </properties> @@ -62,7 +65,6 @@ <directory>src/main/env/${env}/resources</directory> <includes> <include>*.properties</include> - <include>*.xml</include> </includes> </resource> </resources> @@ -147,32 +149,6 @@ </configuration> </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - </plugins> </pluginManagement> </build> @@ -347,6 +323,165 @@ <profiles> <profile> + <id>assembly</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <embeddedWarDir> + ${project.build.directory}/echobase-embedded-${project.version} + </embeddedWarDir> + </properties> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-temp-workdir</id> + <phase>generate-resources</phase> + <configuration> + <target> + <mkdir dir="${embeddedWarDir}/WEB-INF/classes"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + +  + + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-jspc-maven-plugin</artifactId> + <version>${jettyPluginVersion}</version> + <executions> + <execution> + <id>jspc</id> + <goals> + <goal>jspc</goal> + </goals> + <configuration> + <generatedClasses> + ${embeddedWarDir}/WEB-INF/classes + </generatedClasses> + <webXmlFragment> + ${embeddedWarDir}/WEB-INF/webfrag.xml + </webXmlFragment> + <packageRoot>org.apache.jsp</packageRoot> + + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + </dependencies> + </plugin> + +  + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>pack-embedded-war</id> + <goals> + <goal>war</goal> + </goals> + <configuration> + <primaryArtifact>false</primaryArtifact> + <webappDirectory>${embeddedWarDir}</webappDirectory> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> + </manifest> + </archive> + <warName>echobase-ui-${project.version}-embedded</warName> + <webResources> + <webResource> + <directory>${embeddedWarDir}</directory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/webfrag.xml</exclude> + </excludes> + </webResource> + </webResources> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </execution> + </executions> + </plugin> + +  + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + <finalName>echobase-ui-${project.version}-embedded</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>add-log-to-jetty</id> <activation> <file> Added: trunk/echobase-ui/src/main/assembly/bin.xml =================================================================== --- trunk/echobase-ui/src/main/assembly/bin.xml (rev 0) +++ trunk/echobase-ui/src/main/assembly/bin.xml 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,69 @@ + +<assembly> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + + <fileSets> + + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>echobase-ui-${project.version}-embedded.war</include> + </includes> + </fileSet> + + <fileSet> + <directory>target/classes</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>THIRD-PARTY.txt</include> + <include>LICENSE.txt</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/dist</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>**/*.properties</include> + <include>**/*.txt</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/dist</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <filtered>true</filtered> + <includes> + <include>**/*.sh</include> + <include>**/*.bat</include> + </includes> + </fileSet> + </fileSets> +</assembly> Property changes on: trunk/echobase-ui/src/main/assembly/bin.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/assembly/dist/README.txt =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/README.txt (rev 0) +++ trunk/echobase-ui/src/main/assembly/dist/README.txt 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,20 @@ +============================= +EchoBase - ${project.version} +============================= + +Premier démarrage +----------------- + +Pour démarrer EchoBase : + +- Il faut avoir une JDK d'installer sur la machine cible. + +- la variable JDK_HOME doit être positionnée dans les variables d'environements. + +En suite on lance + +./startEchobase.sh (sous linux) + +ou + +startEchobase.bat (sous windows) Property changes on: trunk/echobase-ui/src/main/assembly/dist/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/assembly/dist/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/echobase.properties (rev 0) +++ trunk/echobase-ui/src/main/assembly/dist/echobase.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,37 @@ +### +# #%L +# EchoBase :: UI +# $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% +### +# +# Pollen - v ${project.version} Configuration +# +# See README.txt for more informations about howto custmize Pollen. +# + +# Where to find data +echobase.data.directory=. + +# Where to find war +echobase.war.location=${echobase.data.directory}/echobase-ui-${echobase.version}-embedded.war + +# To create embedded working db +echobase.embedded=true + Property changes on: trunk/echobase-ui/src/main/assembly/dist/echobase.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat (rev 0) +++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,48 @@ +@REM ---------------------------------------------------------------------------- +@REM EchoBase Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM ---------------------------------------------------------------------------- +@echo off + +if not "%JDK_HOME%" == "" goto OkJHome + +echo. +echo ERROR: JDK_HOME not found in your environment. +echo Please set the JDK_HOME variable in your environment to match the +echo location of your Java installation +echo. +goto error + +:OkJHome +echo JDK_HOME defined to %JDK_HOME% + +if exist "%JDK_HOME%\bin\java.exe" goto doit + +echo. +echo ERROR: JDK_HOME is set to an invalid directory. +echo JDK_HOME = "%JDK_HOME%" +echo Please set the JDK_HOME variable in your environment to match the +echo location of your Java installation +echo. +goto error + +:error +set ERROR_CODE=1 +goto end + +:doit +set JAVA_COMMAND="%JDK_HOME%\bin\java.exe" +echo java.exe defined to %JAVA_COMMAND% + +set ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" +echo java options used : %ECHOBASE_OPTS% + +%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}-embedded.war +goto end + +:end + +pause +cmd /C exit /B %ERROR_CODE% Property changes on: trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh (rev 0) +++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2012-09-04 06:14:33 UTC (rev 609) @@ -0,0 +1,16 @@ +#!/bin/sh + +if [ ! -e $JDK_HOME/bin/java ]; then + echo "Do not find $JDK_HOME/bin/java, please add JDK_HOME environnement variable" + exit 1 +fi + +JAVA_EXEC=$JDK_HOME/bin/java + +OLDPWD=`pwd` +cd `dirname $0` +CURRENTPWD=`pwd` +ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" +$JAVA_EXEC $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* +cd "$OLDPWD" + Property changes on: trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-09-04 06:14:33 UTC (rev 609) @@ -34,6 +34,7 @@ import fr.ifremer.echobase.services.EchoBaseServiceContext; import fr.ifremer.echobase.services.UserService; import fr.ifremer.echobase.services.embeddedapplication.EmbeddedApplicationService; +import fr.ifremer.echobase.services.workingDb.WorkingDbConfigurationService; import fr.ird.converter.FloatConverter; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; @@ -193,7 +194,8 @@ TopiaContext rootContext = context.getInternalRootContext(); Preconditions.checkNotNull(rootContext); - boolean schemaExist = dbMeta.getPersistenceHelper().isInternalSchemaCreated(rootContext); + boolean schemaExist = + EchoBaseEntityHelper.isInternalSchemaCreated(rootContext); if (schemaExist) { @@ -228,6 +230,17 @@ service.createDefaultUsers(); } + + if (configuration.isEmbedded()) { + + if (log.isInfoEnabled()) { + log.info("Will try t create default working db " + + "configuration for embedded db."); + } + // try to create a default embedded working db configuration + serviceContext.getService(WorkingDbConfigurationService.class). + createEmbeddedWorkingDbConfiguration(); + } } finally { serviceContext.setInternalTransaction(null); EchoBaseEntityHelper.closeConnection(tx); 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2012-09-04 06:14:33 UTC (rev 609) @@ -167,7 +167,8 @@ // creates a new topia root context from configuration TopiaContext rootContext = - EchobaseTopiaContexts.newWorkingDb(jdbcConfiguration); + EchobaseTopiaContexts.newWorkingDb( + jdbcConfiguration); // keep configuration is session set(PROPERTY_WORKING_DB_CONFIGURATION, jdbcConfiguration); 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2012-09-04 06:14:33 UTC (rev 609) @@ -24,8 +24,10 @@ */ 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.lang.StringUtils; import java.sql.SQLException; @@ -61,7 +63,7 @@ EchoBaseEntityHelper.checkJDBCConnection(jdbcConf); getEchoBaseSession().initWorkingDb(jdbcConf); addFlashMessage(_("echobase.info.workingDbconfiguration.connected", - conf.getUrl())); + conf.getUrl())); result = SUCCESS; } catch (SQLException e) { @@ -79,11 +81,8 @@ public void validate() { jdbcConf = JdbcConfiguration.newConfig( - getConf().getUrl(), - getConf().getLogin(), - password, - getConf().getDriverType() - ); + getConf().getDriverType(), getConf().getUrl(), + getConf().getLogin(), password); // check connexion is ok try { @@ -95,6 +94,19 @@ _("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); } + } + @Override + public void prepare() throws Exception { + + super.prepare(); + + if (DriverType.H2.equals(conf.getDriverType()) && + StringUtils.isBlank(getPassword())) { + + // use a default h2 password + setPassword("sa"); + } + } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java 2012-09-04 06:14:33 UTC (rev 609) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * $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% + */ + import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -154,6 +154,7 @@ echobase.error.workingDbConfiguration.url.already.exists= echobase.error.workingDbConfiguration.url.required= echobase.header.request.result= +echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) echobase.info.dbeditor.propertyDiffsResult= echobase.info.downloadEchoBase=Téléchargement de l'application et des fichiers d'import echobase.info.echoBaseForge=Gestion du projet 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-04 06:14:33 UTC (rev 609) @@ -32,8 +32,8 @@ echobase.action.show.import.documentation=Accéder à la documentation de l'import echobase.action.toEnglish=Utiliser la version anglaise echobase.action.toFrench=Utiliser la version française -echobase.action.usingEnglish=Version anglaise utilisé -echobase.action.usingFrench=Version française utilisé +echobase.action.usingEnglish=Version anglaise utilisée +echobase.action.usingFrench=Version française utilisée echobase.action.workingDbconfiguration.connect=Sélectionner une base de travail echobase.action.workingDbconfiguration.disconnect=Se déconnecter echobase.action.workingDbconfiguration.downloadDriver=Télécharger le pilote jdbc @@ -42,32 +42,32 @@ echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 instrument) echobase.common.addDataAcquisition=Toujours créer des DataAcqusitions echobase.common.admin=Administrateur -echobase.common.areaOfOperation= -echobase.common.author= -echobase.common.authorEmail= +echobase.common.areaOfOperation=AreaOfOperation +echobase.common.author=Auteur +echobase.common.authorEmail=Courriel de l'auteur echobase.common.biometrySampleFile= echobase.common.cellMapsFile= echobase.common.cellPositionReference=cellPositionReference echobase.common.cellRegionAssociationFile= echobase.common.cellRegionResultFile= echobase.common.cellRegionsFile= -echobase.common.dataCentre= -echobase.common.dataCentreEmail= -echobase.common.dataProcessing= +echobase.common.dataCentre=Centre de données +echobase.common.dataCentreEmail=Courriel du centre de données +echobase.common.dataProcessing=DataProcessing echobase.common.dataProcessingNotes=dataProcessingNotes -echobase.common.datum= +echobase.common.datum=Datum echobase.common.digitThreshold=digitThreshold -echobase.common.distributionStatement= +echobase.common.distributionStatement=distributionStatement echobase.common.echotypeFile= -echobase.common.email=Email -echobase.common.entityId= -echobase.common.entityType=Type d'entité +echobase.common.email=Courriel +echobase.common.entityId=Identifiant de l'entité +echobase.common.entityType=Type de l'entité echobase.common.esduByEchotypeAndSpeciesCategoryFile= echobase.common.esduByEchotypeFile= echobase.common.esduBySpeciesAndAgeCategoryFile= echobase.common.esduBySpeciesAndSizeCategoryFile= echobase.common.gearMetadataFile= -echobase.common.id= +echobase.common.id=Identifiant echobase.common.importDataMode=Type d'import echobase.common.importDbFile= echobase.common.importError=Un erreur est survenue pendant l'import \: @@ -80,44 +80,44 @@ echobase.common.importNotes=Remarques sur l'import echobase.common.importResult=Résultat de l'import echobase.common.inProgress=en cours... -echobase.common.institution= +echobase.common.institution=Institution echobase.common.jdbcDriver=Nom du pilote jdbc echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe echobase.common.jdbcUrl=Url de connexion -echobase.common.keywords= -echobase.common.lastModifiedDate= -echobase.common.lastModifiedUser= +echobase.common.keywords=Môts clefs +echobase.common.lastModifiedDate=Date de dernière modification +echobase.common.lastModifiedUser=Utilisateur de dernière modification echobase.common.lengthAgeKeyFile= echobase.common.lengthWeightKeyFile= -echobase.common.litteratureReferences= +echobase.common.litteratureReferences=Références echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat -echobase.common.mission= -echobase.common.missionAbstract= -echobase.common.modificationDate= -echobase.common.modificationText= -echobase.common.modificationUser= +echobase.common.mission=Mission +echobase.common.missionAbstract=Résumé de la mission +echobase.common.modificationDate=Date de modification +echobase.common.modificationText=Modification +echobase.common.modificationUser=Utilisateur echobase.common.moviesFile= -echobase.common.name= +echobase.common.name=Nom echobase.common.operationFile= echobase.common.operationMetadataFile= -echobase.common.organisationLevelAcknowledgements= -echobase.common.organisationReferences= +echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements +echobase.common.organisationReferences=Références organisation echobase.common.password=Mot de passe echobase.common.pilotVersion=Version du pilote jdbc echobase.common.pingDutyCycle=pingDutyCycle -echobase.common.platform= -echobase.common.principalInvestigator= -echobase.common.principalInvestigatorEmail= +echobase.common.platform=Platform +echobase.common.principalInvestigator=Chercheur +echobase.common.principalInvestigatorEmail=Courriel du chercheur echobase.common.processingDescription=processingDescription echobase.common.processingTemplate=processingTemplate -echobase.common.project= +echobase.common.project=Projet echobase.common.resultLabel=Result label echobase.common.soundSpeedCalculationsER60=soundSpeedCalculations (ER60 instrument) echobase.common.soundSpeedCalculationsME70=soundSpeedCalculations (ME70 instrument) echobase.common.sounderConstant=sounderConstant -echobase.common.source= +echobase.common.source=Source echobase.common.subSampleFile= echobase.common.tableDatas= echobase.common.totalSampleFile= @@ -129,8 +129,8 @@ echobase.common.transitFile= echobase.common.transitRelatedActivity=RelatedActivity (transit) echobase.common.user=Utilisateur -echobase.common.vessel= -echobase.common.voyage= +echobase.common.vessel=Navire +echobase.common.voyage=Campagne echobase.common.voyageDescription=Description echobase.common.voyageFile= echobase.confirm.delete.query=Confirmer la suppression de la requète suivante @@ -154,6 +154,7 @@ echobase.error.workingDbConfiguration.url.already.exists=Une connexion existe déjà avec cette url echobase.error.workingDbConfiguration.url.required=Url obligatoire echobase.header.request.result=Résultat de la requète sql +echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données echobase.info.downloadEchoBase=Téléchargement de l'application et des fichiers d'import echobase.info.echoBaseForge=Gestion du projet Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2012-09-04 06:14:33 UTC (rev 609) @@ -58,15 +58,21 @@ <fieldset> <legend><s:text name="echobase.legend.connectionToDb.detail"/></legend> <s:label key="dbConfiguration.url" - label='%{getText("echobase.common.jdbcUrl")}'/> + label='%{getText("echobase.common.jdbcUrl")} (*)'/> <s:label key="dbConfiguration.login" - label='%{getText("echobase.common.jdbcLogin")}'/> + label='%{getText("echobase.common.jdbcLogin")} (*)'/> <s:label key="dbConfiguration.password" - label='%{getText("echobase.common.jdbcPassword")}'/> + label='%{getText("echobase.common.jdbcPassword")} (*)'/> <s:label key="dbConfiguration.driverType.driverClass.name" - label='%{getText("echobase.common.jdbcDriver")}'/> - <s:label key="pilotVersion" id='dbConfiguration_pilotVersion' + label='%{getText("echobase.common.jdbcDriver")} (*)'/> + <s:label key="pilotVersion" label='%{getText("echobase.common.pilotVersion")}'/> + <br/> + <div class="cleanBoth help"> + <label> + (*) <s:text name="echobase.info.click.to.select"/> + </label> + </div> </fieldset> <br/> @@ -84,9 +90,6 @@ </ul> </s:form> -<%--<s:a namespace="/workingDb" action="downloadDriver">--%> -<%--<s:text name="echobase.action.workingDb.downloadDriver"/>--%> -<%--</s:a>--%> 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 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2012-09-04 06:14:33 UTC (rev 609) @@ -86,14 +86,14 @@ readonly="%{confExists}" label="%{getText('echobase.label.workingDbConfiguration.url')}"/> + <s:textarea key="conf.description" required="true" cols="160" rows="4" + readonly="%{confExists}" + label="%{getText('echobase.label.workingDbConfiguration.description')}"/> + <s:textfield key="conf.login" required="true" size="80" readonly="%{confExists}" label="%{getText('echobase.label.workingDbConfiguration.login')}"/> - <s:textarea key="conf.description" required="true" cols="160" rows="4" - readonly="%{confExists}" - label="%{getText('echobase.label.workingDbConfiguration.description')}"/> - <s:if test="confExists"> <s:password key="password" required="true" size="80" label="%{getText('echobase.label.workingDbConfiguration.password')}"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-03 20:17:30 UTC (rev 608) +++ trunk/pom.xml 2012-09-04 06:14:33 UTC (rev 609) @@ -65,6 +65,19 @@ </developers> + <contributors> + <contributor> + <name>Mathieu Doray</name> + <email>mathieu dot doray at ifremer dot fr</email> + <organization>Ifremer</organization> + <organizationUrl>http://ifremer.fr</organizationUrl> + <roles> + <role>document writer</role> + </roles> + <timezone>Europe/Paris</timezone> + </contributor> + </contributors> + <scm> <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection>

1 0

r608 - trunk/src/site/en/rst
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 22:17:30 +0200 (Mon, 03 Sep 2012) New Revision: 608 Url: http://forge.codelutin.com/repositories/revision/echobase/608 Log: >From scmwebeditor -- Fix documentation (still some bad links) Modified: trunk/src/site/en/rst/index.rst Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-09-03 20:16:50 UTC (rev 607) +++ trunk/src/site/en/rst/index.rst 2012-09-03 20:17:30 UTC (rev 608) @@ -54,7 +54,7 @@ .. _Ifremer forge: https://forge.ifremer.fr/www/echor .. _ICES WGFAST: http://www.acoustics.washington.edu/FAST -.. _installation: ./install.html +.. _install: ./install.html .. _model: ./model.html .. _import data: ./imports.html .. _local Echobase database: ./embedded.html

1 0

r607 - trunk/src/site/en/rst
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 22:16:50 +0200 (Mon, 03 Sep 2012) New Revision: 607 Url: http://forge.codelutin.com/repositories/revision/echobase/607 Log: >From scmwebeditor -- Fix documentation (still some bad links) Modified: trunk/src/site/en/rst/index.rst Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-09-03 19:23:14 UTC (rev 606) +++ trunk/src/site/en/rst/index.rst 2012-09-03 20:16:50 UTC (rev 607) @@ -33,30 +33,28 @@ and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (Echobase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. -This site describes the Echobase database. If you are interested in geoR, please visit the `Ifremer forge`_.. +This site describes the Echobase database. If you are interested in geoR, please visit the `Ifremer forge`_. Echobase provide a web-browser interface for importing, editing and querying data, large storage capacities, and an easy integration into Geographical Information Systems or dynamic websites. The Echobase acoustic metadata format follows the `ICES WGFAST`_.Topic Group on metadata standards recommendations. -.. _echoR: <forge.ifremer.fr/www/echor/> -.. _WGFAST: <http://www.acoustics.washington.edu/FAST/> - Documentation ------------- - How to `install`_. Echobase. -- The Echobase `model`_.. +- The Echobase `model`_. -- How to `import data`_. in Echobase. +- How to `import data`_ in Echobase. -- How to create a `local Echobase database`_.. +- How to create a `local Echobase database`_. +.. _Ifremer forge: https://forge.ifremer.fr/www/echor +.. _ICES WGFAST: http://www.acoustics.washington.edu/FAST .. _installation: ./install.html -.. _modèle: ./model.html -.. _imports: ./imports.html -.. _application embarquée: ./embedded.html - +.. _model: ./model.html +.. _import data: ./imports.html +.. _local Echobase database: ./embedded.html

1 0

r606 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/entities echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb echobase-ui/src/main/resources/config echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/includes echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 21:23:14 +0200 (Mon, 03 Sep 2012) New Revision: 606 Url: http://forge.codelutin.com/repositories/revision/echobase/606 Log: improve working db cinematic Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.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/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java 2012-09-03 19:23:14 UTC (rev 606) @@ -42,18 +42,18 @@ H2Dialect.class, n_("echobase.common.driverType.h2")) { @Override - public String getPilotFileName(EchoBaseConfiguration config) { + public String getPilotVersion(EchoBaseConfiguration config) { String version = config.getH2Version(); - return version == null ? null : "h2-" + version + ".jar"; + return version; } }, POSTGRESQL(org.postgresql.Driver.class, PostgreSQLDialect.class, n_("echobase.common.driverType.postgres")) { @Override - public String getPilotFileName(EchoBaseConfiguration config) { - String pgVersion = config.getPostgresqlVersion(); - return pgVersion == null ? null : "postgresql-" + pgVersion + ".jar"; + public String getPilotVersion(EchoBaseConfiguration config) { + String version = config.getPostgresqlVersion(); + return version; } }; @@ -79,8 +79,13 @@ return dialectClass; } - public abstract String getPilotFileName(EchoBaseConfiguration config); + public abstract String getPilotVersion(EchoBaseConfiguration config); + public final String getPilotFileName(EchoBaseConfiguration config) { + String version = getPilotVersion(config); + return version == null ? null : name().toLowerCase() + "-" + version + ".jar"; + } + @Override public String getI18nKey() { return i18nKey; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-03 19:23:14 UTC (rev 606) @@ -60,9 +60,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.net.URISyntaxException; import java.util.List; -import java.util.Properties; /** * To create embedded application. @@ -304,15 +302,21 @@ protected void createStaticArchiveStructure(EmbeddedApplicationConfiguration model, File dir) { try { - File warLocation = model.getWarLocation(); // create / FileUtil.createDirectoryIfNecessary(dir); // copy embedded files to / - copyEmbeddedFiles(dir); + copyEmbeddedTextFile("echobase.properties", dir); + copyEmbeddedTextFile("startEchobase.bat", dir); + copyEmbeddedTextFile("startEchobase.sh", dir); + copyEmbeddedTextFile("README.txt", dir); +// Properties config = new Properties(); +// copyEmbeddedTextFile("echobase.properties", dir, config); + // copy war to / + File warLocation = model.getWarLocation(); FileUtils.copyFile(warLocation, new File(dir, warLocation.getName())); } catch (Exception eee) { @@ -365,38 +369,55 @@ } } -// public File getPilotsDirectory(File dataDirectory) { -// File driverDir = new File(dataDirectory, "drivers"); -// return driverDir; +// protected void copyEmbeddedFiles(File zipDirectory) throws IOException, URISyntaxException { +// +// // config to keep the echobase-embedded values (contains h2 and pg versions) +// Properties config = new Properties(); +// copyEmbeddedTextFile("echobase.properties", zipDirectory, config); +// +// copyEmbeddedTextFile("startEchobase.bat", zipDirectory, null); +// copyEmbeddedTextFile("startEchobase.sh", zipDirectory, null); +// copyEmbeddedTextFile("README.txt", zipDirectory, null); // } - protected void copyEmbeddedFiles(File zipDirectory) throws IOException, URISyntaxException { +// public void copyEmbeddedTextFile(String resourceName, +// File targetDirectory, +// Properties config) throws IOException { +// String resourcePath = EMBEDDED_PATH + resourceName; +// InputStream inputStream = getClass().getResourceAsStream(resourcePath); +// Preconditions.checkNotNull(inputStream, +// "could not find resource " + resourcePath); +// try { +// if (config != null) { +// config.load(inputStream); +// } +// File outputFile = new File(targetDirectory, resourceName); +// if (log.isInfoEnabled()) { +// log.info("Copy configuration to " + resourceName + " to " + outputFile); +// } +// OutputStreamWriter outputStream = new OutputStreamWriter( +// new FileOutputStream(outputFile), Charsets.UTF_8); +// try { +// if (config == null) { +// IOUtils.copy(inputStream, outputStream); +// } else { +// config.store(outputStream, null); +// } +// } finally { +// outputStream.close(); +// } +// } finally { +// inputStream.close(); +// } +// } - // config to keep the echobase-embedded values (contains h2 and pg versions) - Properties config = new Properties(); - copyEmbeddedFiles("echobase.properties", zipDirectory, config); - - copyEmbeddedFiles("startEchobase.bat", zipDirectory, null); - copyEmbeddedFiles("startEchobase.sh", zipDirectory, null); - copyEmbeddedFiles("README.txt", zipDirectory, null); - -// File driverDir = getPilotsDirectory(zipDirectory); -// FileUtil.createDirectoryIfNecessary(driverDir); -// copyEmbeddedFiles(DriverType.H2.getPilotFileName(getConfiguration()), driverDir, null); -// copyEmbeddedFiles(DriverType.POSTGRESQL.getPilotFileName(getConfiguration()), driverDir, null); - } - - public void copyEmbeddedFiles(String resourceName, - File targetDirectory, - Properties config) throws IOException { + public void copyEmbeddedTextFile(String resourceName, + File targetDirectory) throws IOException { String resourcePath = EMBEDDED_PATH + resourceName; InputStream inputStream = getClass().getResourceAsStream(resourcePath); Preconditions.checkNotNull(inputStream, "could not find resource " + resourcePath); try { - if (config != null) { - config.load(inputStream); - } File outputFile = new File(targetDirectory, resourceName); if (log.isInfoEnabled()) { log.info("Copy configuration to " + resourceName + " to " + outputFile); @@ -404,11 +425,7 @@ OutputStreamWriter outputStream = new OutputStreamWriter( new FileOutputStream(outputFile), Charsets.UTF_8); try { - if (config == null) { - IOUtils.copy(inputStream, outputStream); - } else { - config.store(outputStream, null); - } + IOUtils.copy(inputStream, outputStream); } finally { outputStream.close(); } @@ -441,20 +458,4 @@ IOUtils.closeQuietly(inputStream); } } - -// protected void importDb(EmbeddedApplicationConfiguration model, -// EchoBaseServiceContext newServiceContext, -// File exportZipFile, -// EchoBaseUser admin) throws IOException, TopiaException { -// ImportDbConfiguration importConfiguration = -// new ImportDbConfiguration(model, getLocale()); -// importConfiguration.getInput().setFile(exportZipFile); -// File importTempDir = new File(model.getWorkingDirectory(), "importDb"); -// importConfiguration.setWorkingDirectory(importTempDir); -// -// ImportDbService importDbService = -// newServiceContext.getService(ImportDbService.class); -// importDbService.importDb(importConfiguration, admin, false, true); -// } - } Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java 2012-09-03 19:23:14 UTC (rev 606) @@ -0,0 +1,72 @@ +package fr.ifremer.echobase.ui.actions.workingDb; + +import fr.ifremer.echobase.EchoBaseConfiguration; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +/** + * Download jdbc driver. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class DownloadDriver extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Input stream of the file to download. */ + protected transient InputStream inputStream; + + /** File name of the download. */ + protected String fileName; + + /** Length of the file to download. */ + protected long contentLength; + + /** Content type of the file to download. */ + protected String contentType; + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public InputStream getInputStream() { + return inputStream; + } + + public long getContentLength() { + return contentLength; + } + + public String getContentType() { + return contentType; + } + + public String getFileName() { + return fileName; + } + + @Override + public String execute() throws Exception { + + EchoBaseConfiguration configuration = + getEchoBaseApplicationContext().getConfiguration(); + + JdbcConfiguration dbConfiguration = getEchoBaseSession().getWorkingDbConfiguration(); + + fileName = + dbConfiguration.getDriverType().getPilotFileName(configuration); + + File file = new File(configuration.getLibDirectory(), fileName); + + contentType = "application/java-archive"; + contentLength = file.length(); + inputStream = new BufferedInputStream(new FileInputStream(file)); + return SUCCESS; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadDriver.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision 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 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2012-09-03 19:23:14 UTC (rev 606) @@ -27,8 +27,6 @@ import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import java.io.File; - /** * Display a page to show connection details. * @@ -41,14 +39,14 @@ protected JdbcConfiguration dbConfiguration; - protected File jdbcPilot; + protected String pilotVersion; public JdbcConfiguration getDbConfiguration() { return dbConfiguration; } - public File getJdbcPilot() { - return jdbcPilot; + public String getPilotVersion() { + return pilotVersion; } @Override @@ -59,11 +57,9 @@ dbConfiguration = getEchoBaseSession().getWorkingDbConfiguration(); - String pilotName = - dbConfiguration.getDriverType().getPilotFileName(configuration); + pilotVersion = + dbConfiguration.getDriverType().getPilotVersion(configuration); - jdbcPilot = new File(configuration.getLibDirectory(), pilotName); - return SUCCESS; } } Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-03 19:23:14 UTC (rev 606) @@ -30,10 +30,10 @@ <result-types> - <result-type name="redirectWorkingDbConfiguration" + <result-type name="redirectToShowList" class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> <param name="actionName">showList</param> - <param name="namespace">workingDbConfiguration</param> + <param name="namespace">/workingDb</param> <param name="conf.topiaId">${conf.topiaId}</param> </result-type> @@ -60,7 +60,7 @@ <action name="create" method="createConf" class="fr.ifremer.echobase.ui.actions.workingDb.Create"> <result name="input" type="showList"/> - <result type="redirectWorkingDbConfiguration"/> + <result type="redirectToShowList"/> </action>  @@ -68,7 +68,7 @@ class="fr.ifremer.echobase.ui.actions.workingDb.Create"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input" type="showList"/> - <result type="redirectWorkingDbConfiguration"/> + <result type="redirectToShowList"/> </action>  @@ -76,7 +76,7 @@ class="fr.ifremer.echobase.ui.actions.workingDb.Create"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input" type="showList"/> - <result type="redirectWorkingDbConfiguration"/> + <result type="redirectToShowList"/> </action>  @@ -91,7 +91,7 @@ class="fr.ifremer.echobase.ui.actions.workingDb.Delete"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input" type="showList"/> - <result type="redirectWorkingDbConfiguration"/> + <result type="redirectToShowList"/> </action>  @@ -99,13 +99,16 @@ class="fr.ifremer.echobase.ui.actions.workingDb.Connect"> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input" type="showList"/> - <result type="redirectToHome"/> + <result type="redirectAction"> + <param name="actionName">information</param> + <param name="namespace">/workingDb</param> + </result> </action>  <action name="disconnect" class="fr.ifremer.echobase.ui.actions.workingDb.Disconnect"> - <result type="showList"/> + <result type="redirectToShowList"/> </action>  @@ -114,6 +117,16 @@ <result>/WEB-INF/jsp/workingDb/modifications.jsp</result> </action> +  + <action name="downloadDriver" + class="fr.ifremer.echobase.ui.actions.workingDb.DownloadDriver"> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="contentLength">${contentLength}</param> + <param name="contentDisposition">filename="${fileName}"</param> + </result> + </action> + </package> </struts> 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 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-03 19:23:14 UTC (rev 606) @@ -34,8 +34,9 @@ echobase.action.toFrench=Use the french version echobase.action.usingEnglish=English version used echobase.action.usingFrench=French version used -echobase.action.workingDbconfiguration.connect= -echobase.action.workingDbconfiguration.disconnect= +echobase.action.workingDbconfiguration.connect=Connect +echobase.action.workingDbconfiguration.disconnect=Disconnect +echobase.action.workingDbconfiguration.downloadDriver=Télécharger le pilote jdbc echobase.common.acousticDensityUnit= echobase.common.acquisitionSoftwareVersionER60= echobase.common.acquisitionSoftwareVersionME70= @@ -83,7 +84,6 @@ echobase.common.jdbcDriver=Jdbc Driver name echobase.common.jdbcLogin= echobase.common.jdbcPassword= -echobase.common.jdbcPilotPath=Path to jdbc pilot echobase.common.jdbcUrl= echobase.common.keywords= echobase.common.lastModifiedDate= @@ -105,6 +105,7 @@ echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences= echobase.common.password= +echobase.common.pilotVersion=Jdbc pilot version echobase.common.pingDutyCycle= echobase.common.platform= echobase.common.principalInvestigator= 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 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-03 19:23:14 UTC (rev 606) @@ -36,6 +36,7 @@ echobase.action.usingFrench=Version française utilisé echobase.action.workingDbconfiguration.connect=Sélectionner une base de travail echobase.action.workingDbconfiguration.disconnect=Se déconnecter +echobase.action.workingDbconfiguration.downloadDriver=Télécharger le pilote jdbc echobase.common.acousticDensityUnit=acousticDensityUnit echobase.common.acquisitionSoftwareVersionER60=acquisitionSoftwareVersion (ER60 instrument) echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 instrument) @@ -83,7 +84,6 @@ echobase.common.jdbcDriver=Nom du pilote jdbc echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe -echobase.common.jdbcPilotPath=Chemin du pilote jdbc echobase.common.jdbcUrl=Url de connexion echobase.common.keywords= echobase.common.lastModifiedDate= @@ -105,6 +105,7 @@ echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences= echobase.common.password=Mot de passe +echobase.common.pilotVersion=Version du pilote jdbc echobase.common.pingDutyCycle=pingDutyCycle echobase.common.platform= echobase.common.principalInvestigator= Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-03 19:23:14 UTC (rev 606) @@ -126,20 +126,20 @@ </span> </s:a> </li> + <li> + <s:a action="configure" namespace="/embeddedApplication" + method="input" cssClass="appli"> + <span> + <s:text name="echobase.menu.createEmbeddedApplication"/> + </span> + </s:a> + </li> </s:if> <li> <s:a action="userList" namespace="/user" cssClass="user"> <span><s:text name="echobase.menu.users"/></span> </s:a> </li> - <li> - <s:a action="configure" namespace="/embeddedApplication" - method="input" cssClass="appli"> - <span> - <s:text name="echobase.menu.createEmbeddedApplication"/> - </span> - </s:a> - </li> </s:if> <s:else> <s:if test="%{workingDbSelected}"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2012-09-03 15:32:42 UTC (rev 605) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2012-09-03 19:23:14 UTC (rev 606) @@ -23,8 +23,35 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<%--<style type="text/css">--%> +<%--label { background-color: white; color: black; }--%> +<%--</style>--%> +<script type="text/javascript"> + + $(document).ready(function () { + + $('label[id^="dbConfiguration"]').css({'background-color':'white', 'color':'black', 'padding-right':'2px', 'padding-left':'2px' }).click(function () { + var el = $(this)[0]; + if (/textarea/i.test(el.tagName) || (/input/i.test(el.tagName) && /text/i.test(el.type))) { + el.select(); + } else if (!!window.getSelection) { // FF, Safari, Chrome, Opera + var sel = window.getSelection(); + var range = document.createRange(); + range.selectNodeContents(el); + sel.removeAllRanges(); + sel.addRange(range); + } else if (!!document.selection) { // IE + document.selection.empty(); + var range = document.body.createTextRange(); + range.moveToElementText(el); + range.select(); + } + }); + + }); + +</script> <title><s:text name="echobase.title.connectToDbInformations"/></title> <br/> @@ -38,9 +65,28 @@ label='%{getText("echobase.common.jdbcPassword")}'/> <s:label key="dbConfiguration.driverType.driverClass.name" label='%{getText("echobase.common.jdbcDriver")}'/> - <s:label key="jdbcPilot" - label='%{getText("echobase.common.jdbcPilotPath")}'/> + <s:label key="pilotVersion" id='dbConfiguration_pilotVersion' + label='%{getText("echobase.common.pilotVersion")}'/> </fieldset> +<br/> +<s:form id="createForm" namespace="/workingDb"> + <ul class="toolbar floatLeft"> + <li> + <s:submit theme="simple" action="downloadDriver" + key="echobase.action.workingDbconfiguration.downloadDriver"/> + </li> + <li> + <s:submit theme="simple" action="disconnect" + key="echobase.action.workingDbconfiguration.disconnect"/> + </li> + </ul> +</s:form> +<%--<s:a namespace="/workingDb" action="downloadDriver">--%> +<%--<s:text name="echobase.action.workingDb.downloadDriver"/>--%> +<%--</s:a>--%> + + +

1 0

r605 - trunk/src/site/en/rst
by mdoray＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: mdoray Date: 2012-09-03 17:32:42 +0200 (Mon, 03 Sep 2012) New Revision: 605 Url: http://forge.codelutin.com/repositories/revision/echobase/605 Log: >From scmwebeditor -- Modified: trunk/src/site/en/rst/index.rst Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-09-03 15:22:38 UTC (rev 604) +++ trunk/src/site/en/rst/index.rst 2012-09-03 15:32:42 UTC (rev 605) @@ -33,23 +33,27 @@ and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (Echobase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. -This site describes the Echobase database. If you are interested in geoR, see <forge.ifremer.fr/www/echor/> +This site describes the Echobase database. If you are interested in geoR, please visit the `Ifremer forge`_.. Echobase provide a web-browser interface for importing, editing and querying data, large storage capacities, and an easy integration into Geographical Information Systems or dynamic websites. -The Echobase acoustic metadata format follows the ICES WGFAST <http://www.acoustics.washington.edu/FAST/> Topic Group on metadata standards recommendations. +The Echobase acoustic metadata format follows the `ICES WGFAST`_.Topic Group on metadata standards recommendations. -Les documents + +.. _echoR: <forge.ifremer.fr/www/echor/> +.. _WGFAST: <http://www.acoustics.washington.edu/FAST/> + +Documentation ------------- -- La documentation d'`installation`_. +- How to `install`_. Echobase. -- La description du `modèle`_. +- The Echobase `model`_.. -- La description des `imports`_. +- How to `import data`_. in Echobase. -- Comment créer une `application embarquée`_. +- How to create a `local Echobase database`_.. .. _installation: ./install.html .. _modèle: ./model.html

1 0

r604 - trunk/src/site/en/rst
by mdoray＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: mdoray Date: 2012-09-03 17:22:38 +0200 (Mon, 03 Sep 2012) New Revision: 604 Url: http://forge.codelutin.com/repositories/revision/echobase/604 Log: >From scmwebeditor -- Modified: trunk/src/site/en/rst/index.rst Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-09-03 15:16:40 UTC (rev 603) +++ trunk/src/site/en/rst/index.rst 2012-09-03 15:22:38 UTC (rev 604) @@ -26,12 +26,19 @@ Echobase ======== -Présentation +Presentation ------------ -We have designed an open software suite for storing fisheries acoustic data -and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (Echobase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. Echobase provide a web-browser interface for importing, editing and querying data, large storage capacities, and an easy integration into Geographical Information Systems or dynamic websites. The Echobase acoustic metadata format follows the WGFAST Topic Group on metadata standards recommendations. +the French Institute for the Exploitation of the Sea (Ifremer) has designed an open software suite for storing fisheries acoustic data +and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL +database designed to store acoustic, navigation and fishing data from ecosystemic surveys (Echobase) +and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. +This site describes the Echobase database. If you are interested in geoR, see <forge.ifremer.fr/www/echor/> +Echobase provide a web-browser interface for importing, editing and querying data, +large storage capacities, and an easy integration into Geographical Information Systems or dynamic websites. +The Echobase acoustic metadata format follows the ICES WGFAST <http://www.acoustics.washington.edu/FAST/> Topic Group on metadata standards recommendations. + Les documents -------------

1 0