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

r126 - trunk/src/site/rst
by sletellier＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: sletellier Date: 2011-11-25 13:45:20 +0100 (Fri, 25 Nov 2011) New Revision: 126 Url: http://forge.codelutin.com/repositories/revision/echobase/126 Log: Update documentation Modified: trunk/src/site/rst/install.rst Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2011-11-25 12:26:38 UTC (rev 125) +++ trunk/src/site/rst/install.rst 2011-11-25 12:45:20 UTC (rev 126) @@ -34,21 +34,13 @@ :start: 1 :depth: 2 -Première utilisation --------------------- - -Un utilisateur par défaut est crée si la base est vide (première utilisation):: - - login : admin - mot de passe : admin - -Pour des raison de sécurité, il est conseillé de créer un nouvelle admin via l'interface de gestion des utilisateurs. - Configuration d'Echobase ------------------------ -Voici la configuration par défaut:: +La configuration personalisée d'Echobase ce trouve par défaut dans /etc/echobase.properties. +Par defaut le répertoire de travail ce trouve dans /var/local/echobase. Le war du projet (pour créer une application embarqué) est stoqué dans le repertoire war du répertoire de travail. Voici la configuration par défaut:: + data.directory=/var/local/echobase # Repertoire de l'application war.directory=${data.directory}/war # Répertoire où est stoqué le war war.location=${war.directory}/echobase-ui-${project.version}.war # Chemin complêt d'accès au war @@ -56,17 +48,37 @@ Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est normalement nécessaire. Il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la/les ligne(s) ci-dessus modifiée. +Une base de donnée h2 est crée dans le répertoire de travail (data.directory) mais il est possible de configurer une base Postgres. + Installation Postgres --------------------- -Création de l'utilisateur Postgres:: +Pré-requis : + - postgres doit être installé sur la machine (exemple pour un sytème Debian : apt-get install postgresql) + - être connecté avec l'utilisateur (postgres par défaut) qui à les droits d'administrer cette base de donnée. - createuser -P echobase +1. Création de l'utilisateur Postgres -Création de la base de donnée "echobase":: +:: - createdb -E utf8 echobase -O echobase + createuser -P echobase -Il faut positionner le fichier de configuration echobase.properties_ dans /etc et remplacer le mot de passe (hibernate.connection.password) par celui rentré lors de la création de l'utilisateur Postgres. +2. Création de la base de donnée "echobase" -.. _echobase.properties: echobase.properties \ No newline at end of file +:: + + createdb -E utf8 echobase -O echobase + +3. Il faut positionner le fichier de configuration echobase.properties_ dans /etc et remplacer le mot de passe (hibernate.connection.password) par celui rentré lors de la création de l'utilisateur Postgres. + +.. _echobase.properties: echobase.properties + +Première utilisation +-------------------- + +Un utilisateur par défaut est crée si la base est vide (première utilisation):: + + login : admin + mot de passe : admin + +Pour des raison de sécurité, il est conseillé de créer un nouvelle admin via l'interface de gestion des utilisateurs.

1 0

r125 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 13:26:38 +0100 (Fri, 25 Nov 2011) New Revision: 125 Url: http://forge.codelutin.com/repositories/revision/echobase/125 Log: fix javascript Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 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 2011-11-25 12:26:36 UTC (rev 124) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-25 12:26:38 UTC (rev 125) @@ -289,7 +289,7 @@ <s:hidden key="entityType" label=''/> - <s:hidden key="id" label=''/> + <s:hidden id="id" name='id' label=''/> <s:iterator value="columnMetas" var="meta" status="status"> <s:if test="#meta.fK">

1 0

r124 - trunk/src/site/rst
by sletellier＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: sletellier Date: 2011-11-25 13:26:36 +0100 (Fri, 25 Nov 2011) New Revision: 124 Url: http://forge.codelutin.com/repositories/revision/echobase/124 Log: Partial fix documentation Modified: trunk/src/site/rst/install.rst Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2011-11-25 12:14:20 UTC (rev 123) +++ trunk/src/site/rst/install.rst 2011-11-25 12:26:36 UTC (rev 124) @@ -47,16 +47,14 @@ Configuration d'Echobase ------------------------ -Il faut éditer le fichier +Voici la configuration par défaut:: -Voici les configurations par défaut:: - data.directory=/var/local/echobase # Repertoire de l'application war.directory=${data.directory}/war # Répertoire où est stoqué le war war.location=${war.directory}/echobase-ui-${project.version}.war # Chemin complêt d'accès au war -Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est nécessaire. -Pour ce faire, il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la ligne ci-dessus modifiée. +Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est normalement nécessaire. +Il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la/les ligne(s) ci-dessus modifiée. Installation Postgres ---------------------

1 0

r123 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/webapp/WEB-INF/jsp
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 13:14:20 +0100 (Fri, 25 Nov 2011) New Revision: 123 Url: http://forge.codelutin.com/repositories/revision/echobase/123 Log: -fix model rename user to modificationUser -fix modification message Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 12:09:41 UTC (rev 122) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 12:14:20 UTC (rev 123) @@ -242,7 +242,7 @@ EchoBaseUser user) { TableMeta tableMeta = getTableMetas(entityType); DbEditorCsvModel<TopiaEntity> csvModel = buildForImport(tableMeta); - String messagePrefix = "Import du fichier " + importFileName; + String messagePrefix = "Import du fichier " + importFileName + " le " + newDate(); CsvImportResult result = new CsvImportResult(); result.setImportFileName(importFileName); @@ -421,12 +421,12 @@ targetValue = getDecoratorService().decorate( getLocale(), targetValue, null); } - buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", - propertyName, - sourceValue, - targetValue - )); } + buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", + propertyName, + sourceValue, + targetValue + )); } } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-11-25 12:09:41 UTC (rev 122) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2011-11-25 12:14:20 UTC (rev 123) @@ -67,8 +67,8 @@ title="%{getText('echobase.common.modificationDate')}"/> <sjg:gridColumn name="modificationText" sortable="true" title="%{getText('echobase.common.modificationText')}"/> - <sjg:gridColumn name="user" sortable="true" formatter="formatEntityLabel" - title="%{getText('echobase.common.user')}"/> + <sjg:gridColumn name="modificationUser" sortable="true" formatter="formatEntityLabel" + title="%{getText('echobase.common.modificationUser')}"/> </sjg:grid> <br/>

1 0

r122 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor echobase-ui/src/main/resources/config
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 13:09:41 +0100 (Fri, 25 Nov 2011) New Revision: 122 Url: http://forge.codelutin.com/repositories/revision/echobase/122 Log: -fix dbeditor save operation -fix action mapping Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 11:51:24 UTC (rev 121) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 12:09:41 UTC (rev 122) @@ -230,8 +230,7 @@ "Modification utilisateur", entity, user, - false, - null + false ); commitTransaction("Could not commit transaction"); } @@ -260,13 +259,20 @@ try { while (iterator.hasNext()) { TopiaEntity entity = iterator.next(); - saveEntity(tableMeta, - messagePrefix, - entity, - user, - createIfNotFound, - result + boolean create = saveEntity(tableMeta, + messagePrefix, + entity, + user, + createIfNotFound ); + + if (create) { + + result.incrementsNumberCreated(); + } else { + + result.incrementsNumberUpdated(); + } } } finally { @@ -303,12 +309,11 @@ } } - protected void saveEntity(TableMeta tableMeta, - String messagePrefix, - TopiaEntity entity, - EchoBaseUser user, - boolean createIfNotFound, - CsvImportResult result) { + protected boolean saveEntity(TableMeta tableMeta, + String messagePrefix, + TopiaEntity entity, + EchoBaseUser user, + boolean createIfNotFound) { String[] columnNames = tableMeta.getColumnNamesAsArray(); BeanMonitor monitor = null; @@ -322,10 +327,11 @@ // Find or create entity if no id boolean create = StringUtils.isEmpty(id); + if (create) { entityToSave = dao.create(); - result.incrementsNumberCreated(); + } else { entityToSave = dao.findByTopiaId(id); @@ -337,14 +343,16 @@ throw new EchoBaseTechnicalException("Could not found entity with id " + id); } else { entityToSave = dao.create(TopiaEntity.TOPIA_ID, id); - + create = true; } } + } + + if (!create) { + // monitor the existing bean monitor = new BeanMonitor(columnNames); monitor.setBean(entityToSave); - - result.incrementsNumberUpdated(); } tableMeta.copy(entity, entityToSave); @@ -359,6 +367,7 @@ user, propertyDiffs ); + return create; } catch (Exception eee) { throw new EchoBaseTechnicalException("Could not update entity", eee); } finally { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2011-11-25 11:51:24 UTC (rev 121) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2011-11-25 12:09:41 UTC (rev 122) @@ -55,6 +55,10 @@ protected Map<String, String[]> params; + public EchoBaseEntityEnum getEntityType() { + return entityType; + } + public void setEntityType(EchoBaseEntityEnum entityType) { this.entityType = entityType; } Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-25 11:51:24 UTC (rev 121) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-25 12:09:41 UTC (rev 122) @@ -36,7 +36,7 @@ class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> <param name="namespace">/dbeditor</param> <param name="actionName">dbeditor</param> - <param name="tableName">${tableName}</param> + <param name="entityType">${entityType}</param> <param name="supressEmptyParameters">true</param> </result-type> </result-types>

1 0

r121 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/export
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 12:51:24 +0100 (Fri, 25 Nov 2011) New Revision: 121 Url: http://forge.codelutin.com/repositories/revision/echobase/121 Log: - fix sql export - fix submit value Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlCsvModel.java 2011-11-25 11:51:24 UTC (rev 121) @@ -51,7 +51,8 @@ for (String columnHeader : columnHeaders) { modelBuilder.newColumnForExport( columnHeader, - columnHeader + columnHeader, + CsvModelUtil.TO_STRING_FORMATTER ); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportSqlService.java 2011-11-25 11:51:24 UTC (rev 121) @@ -39,6 +39,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.List; import java.util.Map; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java 2011-11-25 11:51:24 UTC (rev 121) @@ -107,18 +107,19 @@ if (sqlQueries.isEmpty()) { // no query saved addActionMessage(_("echobase.info.no.sqlQuery.saved")); - } + } else { - String selectedQueryId = getQuery().getTopiaId(); + String selectedQueryId = getQuery().getTopiaId(); - if (StringUtils.isEmpty(selectedQueryId)) { + if (StringUtils.isEmpty(selectedQueryId)) { - // no query selected - addActionMessage(_("echobase.info.no.sqlQuery.selected")); - } else { + // no query selected + addActionMessage(_("echobase.info.no.sqlQuery.selected")); + } else { - // load query from database - query = service.getEntityById(ExportQuery.class, selectedQueryId); + // load query from database + query = service.getEntityById(ExportQuery.class, selectedQueryId); + } } } } \ No newline at end of file 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 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-25 11:51:24 UTC (rev 121) @@ -52,7 +52,7 @@ echobase.header.user.gridTitle=Liste des utilisateurs echobase.header.voyageSelect=Selectionnez une campagne echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données -echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistré +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.label.createIfNotFound=Créer les entités non trouvées en base Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-25 09:36:01 UTC (rev 120) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-25 11:51:24 UTC (rev 121) @@ -45,7 +45,7 @@ <s:hidden key="sql" label=""/> <s:textfield key="fileName" required="true" size="100" label="%{getText('echobase.label.exportFileName')}"/> - <s:submit key="echobase.action.exportSqlData" align="left"/> + <s:submit value="%{getText('echobase.action.exportSqlData')}" align="left"/> <br/> <sjg:grid id="rows" caption="%{getText('echobase.header.request.result')}" dataType="json" href="%{loadUrl}" gridModel="datas"

1 0

r120 - in trunk/echobase-entities/src: main/resources/i18n test/java/fr/ifremer/echobase/entities
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 10:36:01 +0100 (Fri, 25 Nov 2011) New Revision: 120 Url: http://forge.codelutin.com/repositories/revision/echobase/120 Log: i18n + svn properties Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-25 09:00:46 UTC (rev 119) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-25 09:36:01 UTC (rev 120) @@ -4,8 +4,7 @@ echobase.common.acquisitionSoftwareVersion= echobase.common.addOffset= echobase.common.admin=Administrateur -echobase.common.age= -echobase.common.ageClass=ageClass +echobase.common.age=Age echobase.common.aggregationHierarchy= echobase.common.aggregationLevel= echobase.common.aggregationLevelName= @@ -41,12 +40,9 @@ echobase.common.cellType= echobase.common.citation= echobase.common.classCode= -echobase.common.classGroupId= -echobase.common.classMeaning= echobase.common.codeMemo= echobase.common.comment= echobase.common.commonName= -echobase.common.count= echobase.common.data=data echobase.common.dataAcquisition=dataAcquisition echobase.common.dataCentre= @@ -63,7 +59,6 @@ echobase.common.dateCreated= echobase.common.datum=datum echobase.common.depthStratum=depthStratum -echobase.common.depthStratumId= echobase.common.depthStratumMeaning= echobase.common.depthStratumType= echobase.common.description=Description @@ -82,12 +77,7 @@ echobase.common.elevationRatio= echobase.common.email=Courriel echobase.common.endDate= -echobase.common.endPort= echobase.common.endTimeFillageEngin= -echobase.common.engine= -echobase.common.engineCaracteristic= -echobase.common.engineParameter= -echobase.common.engineType= echobase.common.entityId=Identifiant de l'entité echobase.common.entityModificationLog=Journal des modifications echobase.common.entityModificationLogDTO= @@ -119,21 +109,14 @@ echobase.common.iMO= echobase.common.id=Identifiant echobase.common.impacte= -echobase.common.individu= echobase.common.individual= -echobase.common.individualMeasureParameter= -echobase.common.individualMeasureParameterValue= echobase.common.individualValue= echobase.common.institution= echobase.common.keywords= echobase.common.label= echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification -echobase.common.latitudeEndFillageEngin= -echobase.common.latitudeStartFillageEngin= echobase.common.length= -echobase.common.lengthClass=lengthClass -echobase.common.libelle= echobase.common.licence= echobase.common.linestring= echobase.common.localisation= @@ -144,40 +127,32 @@ echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= -echobase.common.longitudeEndFillageEngin= -echobase.common.longitudeStartFillageEngin= echobase.common.meaning= -echobase.common.measureStep= echobase.common.measureType= -echobase.common.measureUnit= echobase.common.measurementBinSize= echobase.common.measurementMetadata= echobase.common.measurementMetadataName= echobase.common.measurementTypeName= echobase.common.measurementUnit= echobase.common.metadata=metadata -echobase.common.metadataClass=metadataClass echobase.common.mission=mission echobase.common.missionAbstract= echobase.common.missionName= echobase.common.missionReferences= echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification -echobase.common.modificationUser= +echobase.common.modificationUser=Utilisateur echobase.common.name=Nom echobase.common.notes= echobase.common.numberAtAge= echobase.common.numberAtLength= echobase.common.numberSampled= echobase.common.operation= -echobase.common.operationEngineParameterValue= echobase.common.operationGearMetadataValue= echobase.common.operationMeasurementMetadataValue= echobase.common.operationMetadata= echobase.common.operationMetadataName= echobase.common.operationMetadataValue= -echobase.common.operationParameter= -echobase.common.operationParameterValue= echobase.common.operationType= echobase.common.operationTypeName= echobase.common.operator= @@ -198,35 +173,27 @@ echobase.common.referenceMeaning= echobase.common.referenceType= echobase.common.referenceValue= -echobase.common.references= echobase.common.referencingMethod= -echobase.common.region=region -echobase.common.regionName= echobase.common.relatedActivity= echobase.common.sample= echobase.common.sampleAge= echobase.common.sampleAggregation= -echobase.common.sampleCSJ= echobase.common.sampleLength= echobase.common.sampleWeight= echobase.common.scaleFactor= -echobase.common.scientistName= echobase.common.seafloorSubstrate= echobase.common.size= echobase.common.soundSpeedCalculations= echobase.common.sounderConstant= echobase.common.source= -echobase.common.species= -echobase.common.speciesClass=speciesClass -echobase.common.sqlQuery=Requête SQL +echobase.common.species=espèce +echobase.common.sqlQuery=requête SQL echobase.common.standardName= echobase.common.startDate= -echobase.common.startPort= echobase.common.startTimeFillageEngin= echobase.common.station=station echobase.common.stationStartLatitude= echobase.common.stationStartLongitude= -echobase.common.surface= echobase.common.timeCoverageEnd= echobase.common.timeCoverageStart= echobase.common.title= @@ -270,11 +237,9 @@ echobase.common.transitStartTime= echobase.common.transitVessel= echobase.common.units= -echobase.common.user=Utilisateur echobase.common.validMax= echobase.common.validMin= echobase.common.value= -echobase.common.vernacullaireName= echobase.common.vessel=Navire echobase.common.vesselCode= echobase.common.vesselEnginePower= @@ -282,7 +247,6 @@ echobase.common.vesselName= echobase.common.vesselNoiseDesign= echobase.common.vesselTonnage= -echobase.common.vesselTransit= echobase.common.vesselType= echobase.common.voyage=Campagne echobase.common.voyageDescription=Description de campagne @@ -291,5 +255,4 @@ echobase.common.voyageName=Nom de la campagne echobase.common.voyageStartDate=Date de début de campagne echobase.common.voyageStartHarbour=Port de début de campagne -echobase.common.weight= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java =================================================================== --- trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2011-11-25 09:00:46 UTC (rev 119) +++ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2011-11-25 09:36:01 UTC (rev 120) @@ -1,3 +1,26 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.echobase.entities; import com.google.common.collect.Lists; Property changes on: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r119 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-entities/src/main/resources/i18n echobase-entities/src/main/xmi echobase-entities/src/test/java/fr/ifremer/echobase echobase-entities/src/test/java/fr/ifremer/echobase/entities echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: tchemit Date: 2011-11-25 10:00:46 +0100 (Fri, 25 Nov 2011) New Revision: 119 Url: http://forge.codelutin.com/repositories/revision/echobase/119 Log: - fix model (some properties are reserved keyword on pg) - add tests - prune some empty directories Added: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java Removed: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-25 09:00:46 UTC (rev 119) @@ -24,9 +24,7 @@ package fr.ifremer.echobase.entities; import com.google.common.collect.Lists; -import org.nuiton.topia.persistence.TopiaEntity; -import java.util.ArrayList; import java.util.List; /** @@ -38,11 +36,13 @@ public class EntitiesUtil { /** - * @return the entity types of reference in correct order for replication + * @return the entity types of data in correct order for replication * purpose. */ - public static EchoBaseEntityEnum[] getReferenceTypes() { + public static EchoBaseEntityEnum[] getDataTypes() { + List<EchoBaseEntityEnum> result = Lists.newLinkedList(); + result.add(EchoBaseEntityEnum.Voyage); result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.EchotypeDepthStratum); @@ -69,10 +69,10 @@ } /** - * @return the entity types of data in correct order for replication + * @return the entity types of reference in correct order for replication * purpose. */ - public static EchoBaseEntityEnum[] getDataTypes() { + public static EchoBaseEntityEnum[] getReferenceTypes() { List<EchoBaseEntityEnum> result = Lists.newLinkedList(); result.add(EchoBaseEntityEnum.Mission); result.add(EchoBaseEntityEnum.AcousticInstrument); @@ -97,7 +97,6 @@ result.add(EchoBaseEntityEnum.Localisation); result.add(EchoBaseEntityEnum.MeasurementMetadata); result.add(EchoBaseEntityEnum.MeasureType); - result.add(EchoBaseEntityEnum.Mission); result.add(EchoBaseEntityEnum.OperationMetadata); result.add(EchoBaseEntityEnum.OperationType); result.add(EchoBaseEntityEnum.ReferenceDatum); @@ -108,23 +107,5 @@ return result.toArray(new EchoBaseEntityEnum[result.size()]); } - /** - * 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 (contract.getPackage().equals(entitiesPackage)) { - refClasses.add(echoBaseEntityEnum); - } - } - return refClasses.toArray(new EchoBaseEntityEnum[refClasses.size()]); - } } Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java 2011-11-25 09:00:46 UTC (rev 119) @@ -40,7 +40,7 @@ result.setEntityId(getEntityId()); result.setModificationDate(getModificationDate()); result.setModificationText(getModificationText()); - result.setUser(getUser().toDTO()); + result.setModificationUser(getModificationUser().toDTO()); return result; } } Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-25 09:00:46 UTC (rev 119) @@ -160,8 +160,10 @@ echobase.common.mission=mission echobase.common.missionAbstract= echobase.common.missionName= +echobase.common.missionReferences= echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification +echobase.common.modificationUser= echobase.common.name=Nom echobase.common.notes= echobase.common.numberAtAge= Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Added: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java =================================================================== --- trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java (rev 0) +++ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2011-11-25 09:00:46 UTC (rev 119) @@ -0,0 +1,74 @@ +package fr.ifremer.echobase.entities; + +import com.google.common.collect.Lists; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Mission; +import junit.framework.Assert; +import org.junit.Test; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.ArrayList; +import java.util.List; + +/** + * To test the class {@link EntitiesUtil}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EntitiesUtilTest { + + @Test + public void getReferenceTypes() { + + EchoBaseEntityEnum[] types = EntitiesUtil.getReferenceTypes(); + + List<EchoBaseEntityEnum> expectedTypes = + Lists.newArrayList(getContractsOf(Mission.class.getPackage())); + + Assert.assertNotNull(types); + Assert.assertEquals(expectedTypes.size(), types.length); + + for (EchoBaseEntityEnum referenceType : types) { + Assert.assertTrue("Missing type : " + referenceType, + expectedTypes.contains(referenceType)); + } + } + + @Test + public void getDataTypes() { + + EchoBaseEntityEnum[] types = EntitiesUtil.getDataTypes(); + + List<EchoBaseEntityEnum> expectedTypes = + Lists.newArrayList(getContractsOf(Voyage.class.getPackage())); + + Assert.assertNotNull(types); + Assert.assertEquals(expectedTypes.size(), types.length); + + for (EchoBaseEntityEnum referenceType : types) { + Assert.assertTrue("Missing type : " + referenceType, + expectedTypes.contains(referenceType)); + } + } + + /** + * 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-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-24 23:43:49 UTC (rev 118) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-11-25 09:00:46 UTC (rev 119) @@ -427,7 +427,7 @@ dao.create( EntityModificationLog.PROPERTY_ENTITY_TYPE, tableMeta.getEntityEnum().name(), EntityModificationLog.PROPERTY_ENTITY_ID, topiaId, - EntityModificationLog.PROPERTY_USER, user, + EntityModificationLog.PROPERTY_MODIFICATION_USER, user, EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), EntityModificationLog.PROPERTY_MODIFICATION_TEXT, buffer.toString() );

1 0

r118 - trunk/echobase-entities
by tchemit＠users.forge.codelutin.com 24 Nov '11

24 Nov '11

Author: tchemit Date: 2011-11-25 00:43:49 +0100 (Fri, 25 Nov 2011) New Revision: 118 Url: http://forge.codelutin.com/repositories/revision/echobase/118 Log: optimize dependencies Modified: trunk/echobase-entities/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-24 23:42:22 UTC (rev 117) +++ trunk/echobase-entities/pom.xml 2011-11-24 23:43:49 UTC (rev 118) @@ -56,10 +56,10 @@ <artifactId>commons-collections</artifactId> </dependency--> - <dependency> +  <dependency> <groupId>com.google.guava</groupId>

1 0

r117 - in trunk: echobase-entities echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-entities/src/main/java/fr/ifremer/echobase/entities/data echobase-entities/src/main/java/fr/ifremer/echobase/entities/references echobase-entities/src/test/java/fr/ifremer/echobase echobase-services echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/test/java/fr/ifremer/echobase echobase-services/src/test/java/fr/ifremer/echobase/entities echobase-servic
by tchemit＠users.forge.codelutin.com 24 Nov '11

24 Nov '11

Author: tchemit Date: 2011-11-25 00:42:22 +0100 (Fri, 25 Nov 2011) New Revision: 117 Url: http://forge.codelutin.com/repositories/revision/echobase/117 Log: - do not expose entities module as test just to obtain basedir :( - avoid to create a class for one method - do NOT use a none hand build entity types for replication - optimize dependencies Added: trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java Removed: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java Modified: trunk/echobase-entities/pom.xml trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java trunk/echobase-ui/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/pom.xml 2011-11-24 23:42:22 UTC (rev 117) @@ -54,12 +54,12 @@  <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - </dependency--> + </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -132,19 +132,8 @@ <build> <plugins> + <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <configuration> @@ -212,13 +201,6 @@ </plugins> - <testResources> - <testResource> - <directory>${maven.src.dir}/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - </build> </project> Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2011-11-24 23:42:22 UTC (rev 117) @@ -23,13 +23,14 @@ */ package fr.ifremer.echobase.entities; +import com.google.common.collect.Lists; import org.nuiton.topia.persistence.TopiaEntity; import java.util.ArrayList; import java.util.List; /** - * Utility method for enities + * Utility method for entities. * * @author sletellier <letellier(a)codelutin.com> * @since 0.2 @@ -37,6 +38,77 @@ public class EntitiesUtil { /** + * @return the entity types of reference in correct order for replication + * purpose. + */ + public static EchoBaseEntityEnum[] getReferenceTypes() { + List<EchoBaseEntityEnum> result = Lists.newLinkedList(); + result.add(EchoBaseEntityEnum.Voyage); + result.add(EchoBaseEntityEnum.Echotype); + result.add(EchoBaseEntityEnum.EchotypeDepthStratum); + result.add(EchoBaseEntityEnum.Transit); + result.add(EchoBaseEntityEnum.TransitVessel); + result.add(EchoBaseEntityEnum.Transect); + result.add(EchoBaseEntityEnum.TransectAcousticInstrument); + result.add(EchoBaseEntityEnum.DataAcquisition); + result.add(EchoBaseEntityEnum.DataProcessing); + result.add(EchoBaseEntityEnum.Cell); + result.add(EchoBaseEntityEnum.Data); + result.add(EchoBaseEntityEnum.Operation); + result.add(EchoBaseEntityEnum.OperationMetadataValue); + result.add(EchoBaseEntityEnum.OperationMeasurementMetadataValue); + result.add(EchoBaseEntityEnum.Individual); + result.add(EchoBaseEntityEnum.OperationGearMetadataValue); + result.add(EchoBaseEntityEnum.Sample); + result.add(EchoBaseEntityEnum.SampleAge); + result.add(EchoBaseEntityEnum.SampleLength); + result.add(EchoBaseEntityEnum.SampleAggregation); + result.add(EchoBaseEntityEnum.AggregationLevel); + + return result.toArray(new EchoBaseEntityEnum[result.size()]); + } + + /** + * @return the entity types of data in correct order for replication + * purpose. + */ + public static EchoBaseEntityEnum[] getDataTypes() { + List<EchoBaseEntityEnum> result = Lists.newLinkedList(); + result.add(EchoBaseEntityEnum.Mission); + result.add(EchoBaseEntityEnum.AcousticInstrument); + result.add(EchoBaseEntityEnum.AreaOfOperation); + result.add(EchoBaseEntityEnum.Calibration); + result.add(EchoBaseEntityEnum.Category); + result.add(EchoBaseEntityEnum.CategoryMeaning); + result.add(EchoBaseEntityEnum.CategoryRef); + result.add(EchoBaseEntityEnum.CategoryType); + result.add(EchoBaseEntityEnum.CellMethod); + result.add(EchoBaseEntityEnum.CellType); + result.add(EchoBaseEntityEnum.DataMetadata); + result.add(EchoBaseEntityEnum.DataMetadataName); + result.add(EchoBaseEntityEnum.DataQuality); + result.add(EchoBaseEntityEnum.DepthStratum); + result.add(EchoBaseEntityEnum.DepthStratumType); + result.add(EchoBaseEntityEnum.Gear); + result.add(EchoBaseEntityEnum.GearMetadata); + result.add(EchoBaseEntityEnum.GearMetadataValue); + result.add(EchoBaseEntityEnum.GearType); + result.add(EchoBaseEntityEnum.Impacte); + result.add(EchoBaseEntityEnum.Localisation); + result.add(EchoBaseEntityEnum.MeasurementMetadata); + result.add(EchoBaseEntityEnum.MeasureType); + result.add(EchoBaseEntityEnum.Mission); + result.add(EchoBaseEntityEnum.OperationMetadata); + result.add(EchoBaseEntityEnum.OperationType); + result.add(EchoBaseEntityEnum.ReferenceDatum); + result.add(EchoBaseEntityEnum.ReferencingMethod); + result.add(EchoBaseEntityEnum.Species); + result.add(EchoBaseEntityEnum.Station); + result.add(EchoBaseEntityEnum.Vessel); + return result.toArray(new EchoBaseEntityEnum[result.size()]); + } + + /** * Used to get all contract of a package * * @param entitiesPackage package contening desired entities Deleted: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/DataUtil.java 2011-11-24 23:42:22 UTC (rev 117) @@ -1,45 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.entities.data; - -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EntitiesUtil; - -/** - * Data method utility - * - * @author sletellier <letellier(a)codelutin.com> - * @since 0.2 - */ -public class DataUtil { - - /** - * Used to get all contract of a data package - * - * @return contracts in package data - */ - public static EchoBaseEntityEnum[] getDataContracts() { - return EntitiesUtil.getContractsOf(DataUtil.class.getPackage()); - } -} Deleted: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/references/ReferencesUtil.java 2011-11-24 23:42:22 UTC (rev 117) @@ -1,45 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.entities.references; - -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EntitiesUtil; - -/** - * References method utility - * - * @author sletellier <letellier(a)codelutin.com> - * @since 0.2 - */ -public class ReferencesUtil { - - /** - * Used to get all contract of a referenciel package - * - * @return contracts in package referenciel - */ - public static EchoBaseEntityEnum[] getReferencielContracts() { - return EntitiesUtil.getContractsOf(ReferencesUtil.class.getPackage()); - } -} Deleted: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java =================================================================== --- trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java 2011-11-24 23:42:22 UTC (rev 117) @@ -1,54 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase; - -import org.apache.commons.io.FileUtils; -import org.junit.Ignore; - -import java.io.File; - -/** - * Utility methods for tests - * - * @author sletellier <letellier(a)codelutin.com> - * @since 0.2 - */ -@Ignore -public class TestHelper { - - protected static File basedir; - - public static File getBasedir() { - if (basedir == null) { -// String tmp = System.getProperty("basedir"); -// if (tmp == null) { -// tmp = new File("").getAbsolutePath(); -// } -// basedir = new File(tmp); - basedir = FileUtils.getTempDirectory(); - } - return basedir; - } - -} Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/pom.xml 2011-11-24 23:42:22 UTC (rev 117) @@ -24,14 +24,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>echobase-entities</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> -  + </dependency>  @@ -68,10 +60,10 @@ <artifactId>xwork-core</artifactId> </dependency--> -  + </dependency> <dependency> <groupId>commons-logging</groupId> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-24 23:42:22 UTC (rev 117) @@ -28,9 +28,8 @@ import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.EntitiesUtil; import fr.ifremer.echobase.entities.ExportQuery; -import fr.ifremer.echobase.entities.data.DataUtil; -import fr.ifremer.echobase.entities.references.ReferencesUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -251,7 +250,7 @@ protected void replicateVoyages(TopiaContext topiaContextDest, String... voyagesIds) throws TopiaException { TopiaReplicationService service = getTransaction().getService(TopiaReplicationService.class); - ReplicationModel replicationModel = service.prepare(DataUtil.getDataContracts(), true, voyagesIds); + ReplicationModel replicationModel = service.prepare(EntitiesUtil.getDataTypes(), true, voyagesIds); try { service.doReplicate(replicationModel, topiaContextDest); } catch (Exception eee) { @@ -263,7 +262,7 @@ protected void replicateReferentiel(TopiaContext topiaContextDest) throws TopiaException { // Get all referenciel contracts - EchoBaseEntityEnum[] referencielClass = ReferencesUtil.getReferencielContracts(); + EchoBaseEntityEnum[] referencielClass = EntitiesUtil.getReferenceTypes(); TopiaReplicationService service = getTransaction().getService(TopiaReplicationService.class); ReplicationModel replicationModel = service.prepareForAll(referencielClass); try { Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java (from rev 116, trunk/echobase-entities/src/test/java/fr/ifremer/echobase/TestHelper.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/TestHelper.java 2011-11-24 23:42:22 UTC (rev 117) @@ -0,0 +1,56 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase; + +import org.apache.commons.io.FileUtils; +import org.junit.Ignore; + +import java.io.File; + +/** + * Utility methods for tests + * + * @author sletellier <letellier(a)codelutin.com> + * @since 0.2 + */ +@Ignore +public class TestHelper { + + protected static File basedir; + + public static File getBasedir() { + //FIXME : No we do not want to go in tmp directory :( We want to stay + // inside of the project. So a mvn clean will remove all tests data. + if (basedir == null) { +// String tmp = System.getProperty("basedir"); +// if (tmp == null) { +// tmp = new File("").getAbsolutePath(); +// } +// basedir = new File(tmp); + basedir = FileUtils.getTempDirectory(); + } + return basedir; + } + +} Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/entities/MockEntityVisitorCreator.java 2011-11-24 23:42:22 UTC (rev 117) @@ -47,7 +47,8 @@ public class MockEntityVisitorCreator implements EntityVisitor { /** Logger. */ - private static final Log log = LogFactory.getLog(MockEntityVisitorCreator.class); + private static final Log log = + LogFactory.getLog(MockEntityVisitorCreator.class); protected TopiaContext transaction; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/AbstractEchoBaseServiceTest.java 2011-11-24 23:42:22 UTC (rev 117) @@ -57,7 +57,6 @@ @After public void after() throws TopiaException { if (transaction != null && !transaction.isClosed()) { - transaction.rollbackTransaction(); transaction.closeContext(); } } Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-24 23:06:43 UTC (rev 116) +++ trunk/echobase-ui/pom.xml 2011-11-24 23:42:22 UTC (rev 117) @@ -135,6 +135,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency>

1 0